diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:41 +0900 |
| commit | 9d14070f656addddce3d63fd483de46930b51850 (patch) | |
| tree | a8767c2547dd2b6f49974503a5169d8c08de00e9 /arch/sh/kernel/cpu/Makefile | |
| parent | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (diff) | |
| parent | a319add1e24c43d285b781332cfa532405466650 (diff) | |
| download | talos-obmc-linux-9d14070f656addddce3d63fd483de46930b51850.tar.gz talos-obmc-linux-9d14070f656addddce3d63fd483de46930b51850.zip | |
Merge branch 'sh/hwblk' into sh-latest
Diffstat (limited to 'arch/sh/kernel/cpu/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index 5366fdf8c566..fa58bfd30d82 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile @@ -19,6 +19,3 @@ obj-$(CONFIG_SH_ADC) += adc.o obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.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 |
