diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-shmobile/Kconfig | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index aeceb9b92aeb..f2b88c5fe142 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -7,7 +7,6 @@ config ARCH_SH7367 | |||
| 7 | select CPU_V6 | 7 | select CPU_V6 |
| 8 | select HAVE_CLK | 8 | select HAVE_CLK |
| 9 | select COMMON_CLKDEV | 9 | select COMMON_CLKDEV |
| 10 | select GENERIC_TIME | ||
| 11 | select GENERIC_CLOCKEVENTS | 10 | select GENERIC_CLOCKEVENTS |
| 12 | 11 | ||
| 13 | config ARCH_SH7377 | 12 | config ARCH_SH7377 |
| @@ -15,7 +14,6 @@ config ARCH_SH7377 | |||
| 15 | select CPU_V7 | 14 | select CPU_V7 |
| 16 | select HAVE_CLK | 15 | select HAVE_CLK |
| 17 | select COMMON_CLKDEV | 16 | select COMMON_CLKDEV |
| 18 | select GENERIC_TIME | ||
| 19 | select GENERIC_CLOCKEVENTS | 17 | select GENERIC_CLOCKEVENTS |
| 20 | 18 | ||
| 21 | config ARCH_SH7372 | 19 | config ARCH_SH7372 |
| @@ -23,7 +21,6 @@ config ARCH_SH7372 | |||
| 23 | select CPU_V7 | 21 | select CPU_V7 |
| 24 | select HAVE_CLK | 22 | select HAVE_CLK |
| 25 | select COMMON_CLKDEV | 23 | select COMMON_CLKDEV |
| 26 | select GENERIC_TIME | ||
| 27 | select GENERIC_CLOCKEVENTS | 24 | select GENERIC_CLOCKEVENTS |
| 28 | 25 | ||
| 29 | comment "SH-Mobile Board Type" | 26 | comment "SH-Mobile Board Type" |