diff options
| author | Simon Horman <horms@verge.net.au> | 2012-11-08 03:49:35 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-11-08 03:49:35 -0500 |
| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/mach-shmobile/Kconfig | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
| parent | 2944628607f76e4755660cd710f22a4748ef88d8 (diff) | |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index f58c3ea9773..4eddca14ae0 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -2,18 +2,6 @@ if ARCH_SHMOBILE | |||
| 2 | 2 | ||
| 3 | comment "SH-Mobile System Type" | 3 | comment "SH-Mobile System Type" |
| 4 | 4 | ||
| 5 | config ARCH_SH7367 | ||
| 6 | bool "SH-Mobile G3 (SH7367)" | ||
| 7 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
| 8 | select CPU_V6 | ||
| 9 | select SH_CLK_CPG | ||
| 10 | |||
| 11 | config ARCH_SH7377 | ||
| 12 | bool "SH-Mobile G4 (SH7377)" | ||
| 13 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
| 14 | select CPU_V7 | ||
| 15 | select SH_CLK_CPG | ||
| 16 | |||
| 17 | config ARCH_SH7372 | 5 | config ARCH_SH7372 |
| 18 | bool "SH-Mobile AP4 (SH7372)" | 6 | bool "SH-Mobile AP4 (SH7372)" |
| 19 | select ARCH_WANT_OPTIONAL_GPIOLIB | 7 | select ARCH_WANT_OPTIONAL_GPIOLIB |