diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:14:39 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:20:13 +0200 |
commit | 4369c5f3ae82009aa45115884208aada5a8c9273 (patch) | |
tree | e9f877b28fdd22e78fea9cbadc6cd0f1e3744a25 /arch/arm/mach-clps711x/Kconfig | |
parent | Merge tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | ARM: clps711x: Remove board support for CEIVA (diff) | |
download | linux-4369c5f3ae82009aa45115884208aada5a8c9273.tar.xz linux-4369c5f3ae82009aa45115884208aada5a8c9273.zip |
Merge branch 'clps711x/cleanup' into next/cleanup2
Various cleanups for the clps711x platform from
Alexander Shiyan <shc_work@mail.ru> via email:
* clps711x/cleanup:
ARM: clps711x: Remove board support for CEIVA
ARM: clps711x: Fix register definitions
ARM: clps711x: Fix lowlevel debug-macro
ARM: clps711x: Added simple clock framework
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-clps711x/Kconfig')
-rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index ea036d621581..e6135363765a 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -16,12 +16,6 @@ config ARCH_CDB89712 The board includes 2 serial ports, Ethernet, IRDA, and expansion headers. It comes with 16 MB SDRAM and 8 MB flash ROM. -config ARCH_CEIVA - bool "CEIVA" - help - Say Y here if you intend to run this kernel on the Ceiva/Polaroid - PhotoMax Digital Picture Frame. - config ARCH_CLEP7312 bool "CLEP7312" help |