diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-30 16:27:54 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-30 16:27:54 -0700 |
| commit | c53629413409782eeafb4e314dc8c6c8094bff3b (patch) | |
| tree | e4b24dcf2052759dbf360f63e188b041cc6d909c /arch/arm/Kconfig | |
| parent | 51a1ec0164e2030e0492bdede4e68090a3394c52 (diff) | |
| parent | df072717eb0050326f0f63eed98200412c395831 (diff) | |
| download | linux-stable-c53629413409782eeafb4e314dc8c6c8094bff3b.tar.gz linux-stable-c53629413409782eeafb4e314dc8c6c8094bff3b.tar.bz2 linux-stable-c53629413409782eeafb4e314dc8c6c8094bff3b.zip | |
Merge branch 'lpc32xx/devel' into next/soc
* lpc32xx/devel: (22 commits)
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
ARM: LPC32xx: Move uart6 irda disable to serial.c
ARM: LPC32xx: Cleanup board init, remove duplicate clock init
ARM: LPC32xx: Remove spi chip definitions
ARM: LPC32xx: Remove spi chipselect request from board init
ARM: LPC32xx: Add dt settings to the at25 node
ARM: LPC32xx: Build arch dtbs
ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"
ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
ARM: LPC32xx: High Speed UART configuration via DT
ARM: LPC32xx: DT conversion of Standard UARTs
ARM: LPC32xx: DTS adjustment for using pl18x primecell
ARM: LPC32xx: Add MMC controller support
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Clock adjustment for key matrix controller
ARM: LPC32xx: DTS adjustment for key matrix controller
ARM: LPC32xx: Add dts for EA3250 reference board
ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
ARM: LPC32xx: Add DMA configuration to platform data
ARM: LPC32xx: Remove SLC controller initialization from platform init
...
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3b9c64817d23..e86fe20b7d09 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1019,8 +1019,6 @@ source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/mach-ks8695/Kconfig" -source "arch/arm/mach-lpc32xx/Kconfig" - source "arch/arm/mach-msm/Kconfig" source "arch/arm/mach-mv78xx0/Kconfig" |