diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/sh/kernel/cpu/Makefile | |
| parent | Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff) | |
| parent | omap4: Add support for i2c init (diff) | |
| download | linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.tar.xz linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.zip | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/sh/kernel/cpu/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index 0e48bc61c272..4edcb60a1355 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/ # Common interfaces. obj-$(CONFIG_SH_ADC) += adc.o -obj-$(CONFIG_SH_CLK_CPG) += clock-cpg.o +obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o obj-$(CONFIG_SH_FPU) += fpu.o obj-$(CONFIG_SH_FPU_EMU) += fpu.o |