diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 06:45:30 -0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 06:45:30 -0200 |
commit | b93cd6a0c7352b428ba2b8437b44fff6e76d81d2 (patch) | |
tree | 9521480c841f978f8299374a649d4c2ef0b2b22b /drivers/sh/Makefile | |
parent | d291ffb3cf4f8f74b73bac77478c619251ee8a9f (diff) | |
parent | ab4f75cd0a9f5ffdcc3d9fc2b29ca14525215b78 (diff) | |
download | linux-b93cd6a0c7352b428ba2b8437b44fff6e76d81d2.tar.bz2 |
Merge branch 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh
* 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh:
mailmap: Fix up some renesas attributions
sh: clkfwk: Kill off remaining debugfs cruft.
drivers: sh: Kill off dead pathname for runtime PM stub.
drivers: sh: Generalize runtime PM platform stub.
sh: Wire up process_vm syscalls.
sh: clkfwk: add clk_rate_mult_range_round()
serial: sh-sci: Fix up SH-2A SCIF support.
sh: Fix cached/uncaced address calculation in 29bit mode
Diffstat (limited to 'drivers/sh/Makefile')
-rw-r--r-- | drivers/sh/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 24e6cec0ae8d..67e272ab1623 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile @@ -7,3 +7,11 @@ obj-$(CONFIG_HAVE_CLK) += clk/ obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_SUPERHYWAY) += superhyway/ obj-$(CONFIG_GENERIC_GPIO) += pfc.o + +# +# For the moment we only use this framework for ARM-based SH/R-Mobile +# platforms and generic SH. SH-based SH-Mobile platforms are still using +# an older framework that is pending up-porting, at which point this +# special casing can go away. +# +obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE) += pm_runtime.o |