diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /arch/sh/kernel/cpu/Makefile | |
| parent | a4d5247310c993b6b30f1686be12ddacfc41142a (diff) | |
| parent | d3442b2bb7ce4089fadcf483b8ae9766ab480238 (diff) | |
| download | linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.bz2 | |
Merge branch 'sh/pm-runtime' into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index ae95935d93cd..5366fdf8c566 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile @@ -18,4 +18,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/ obj-$(CONFIG_SH_ADC) += adc.o obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o -obj-y += irq/ init.o clock.o fpu.o hwblk.o proc.o +obj-y += irq/ init.o clock.o fpu.o proc.o +ifneq ($(CONFIG_CPU_SUBTYPE_SH7722)$(CONFIG_CPU_SUBTYPE_SH7723)$(CONFIG_CPU_SUBTYPE_SH7724),y) +obj-y += hwblk.o +endif |