diff options
author | Kevin Wells <wellsk40@gmail.com> | 2010-07-28 03:38:52 -0700 |
---|---|---|
committer | Kevin Wells <wellsk40@gmail.com> | 2010-07-28 03:38:52 -0700 |
commit | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (patch) | |
tree | 376b61082713ca866c85318c034c8155124a07af /arch/arm/Kconfig | |
parent | fc0f5ac8fe693d1b05f5a928cc48135d1c8b7f2e (diff) | |
parent | 408059495a372f1a9845672e58608fb6d8ec0c40 (diff) | |
download | linux-cccf59abea4e1c36322e365d6e61ff7de1f3ee07.tar.bz2 |
Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 98922f7d2d12..9a189f757c93 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -482,6 +482,19 @@ config ARCH_LOKI help Support for the Marvell Loki (88RC8480) SoC. +config ARCH_LPC32XX + bool "NXP LPC32XX" + select CPU_ARM926T + select ARCH_REQUIRE_GPIOLIB + select HAVE_IDE + select ARM_AMBA + select USB_ARCH_HAS_OHCI + select COMMON_CLKDEV + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + help + Support for the NXP LPC32XX family of processors + config ARCH_MV78XX0 bool "Marvell MV78xx0" select CPU_FEROCEON @@ -845,6 +858,8 @@ source "arch/arm/mach-lh7a40x/Kconfig" source "arch/arm/mach-loki/Kconfig" +source "arch/arm/mach-lpc32xx/Kconfig" + source "arch/arm/mach-msm/Kconfig" source "arch/arm/mach-mv78xx0/Kconfig" |