diff options
| author | Linus Torvalds | 2011-11-02 04:24:30 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-02 04:24:30 +0100 |
| commit | 510597e26e2a072e2d46ea5bc57feaf385e37f70 (patch) | |
| tree | 5ffe90e6569481506b06fb6d6a409655fac4f7f6 /arch/arm/Kconfig | |
| parent | Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | ARM: mach-nuc93x: delete (diff) | |
| download | kernel-qcow2-linux-510597e26e2a072e2d46ea5bc57feaf385e37f70.tar.gz kernel-qcow2-linux-510597e26e2a072e2d46ea5bc57feaf385e37f70.tar.xz kernel-qcow2-linux-510597e26e2a072e2d46ea5bc57feaf385e37f70.zip | |
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
* 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
ARM: mach-nuc93x: delete
Fix up trivial delete/edit conflicts in
arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9ac5a15d8ec0..611c98dab681 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,14 +609,6 @@ config ARCH_W90X900 <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/ ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller> -config ARCH_NUC93X - bool "Nuvoton NUC93X CPU" - select CPU_ARM926T - select CLKDEV_LOOKUP - help - Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a - low-power and high performance MPEG-4/JPEG multimedia controller chip. - config ARCH_TEGRA bool "NVIDIA Tegra" select CLKDEV_LOOKUP @@ -1012,8 +1004,6 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" source "arch/arm/plat-nomadik/Kconfig" -source "arch/arm/mach-nuc93x/Kconfig" - source "arch/arm/plat-omap/Kconfig" source "arch/arm/mach-omap1/Kconfig" |