summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Kconfig
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2012-11-08 17:49:35 +0900
committerSimon Horman <horms@verge.net.au>2012-11-08 17:49:35 +0900
commitab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch)
tree4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/mach-shmobile/Kconfig
parent631a7b5d958d2ef2c2333b105794c693642f0641 (diff)
parent2944628607f76e4755660cd710f22a4748ef88d8 (diff)
downloadop-kernel-dev-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.zip
op-kernel-dev-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.gz
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/Kconfig12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f58c3ea..4eddca1 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -2,18 +2,6 @@ if ARCH_SHMOBILE
comment "SH-Mobile System Type"
-config ARCH_SH7367
- bool "SH-Mobile G3 (SH7367)"
- select ARCH_WANT_OPTIONAL_GPIOLIB
- select CPU_V6
- select SH_CLK_CPG
-
-config ARCH_SH7377
- bool "SH-Mobile G4 (SH7377)"
- select ARCH_WANT_OPTIONAL_GPIOLIB
- select CPU_V7
- select SH_CLK_CPG
-
config ARCH_SH7372
bool "SH-Mobile AP4 (SH7372)"
select ARCH_WANT_OPTIONAL_GPIOLIB
OpenPOWER on IntegriCloud