sugar/linux
1
0
Fork 0
Code Activity

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

Browse Source
This commit is contained in:
Russell King
2011-05-23 18:05:10 +01:00
parent e8765afe54 667f390bee a35d4e5873 4d5336d50a 041f10d46f be20902ba6
commit 4b60e5f90d
162 changed files with 412 additions and 10652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/Kconfig
View File

@@ -381,16 +381,6 @@ config ARCH_MXS
help
Support for Freescale MXS-based family of processors
config ARCH_STMP3XXX
bool "Freescale STMP3xxx"
select CPU_ARM926T
select CLKDEV_LOOKUP
select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select USB_ARCH_HAS_EHCI
help
Support for systems based on the Freescale 3xxx CPUs.
config ARCH_NETX
bool "Hilscher NetX based"
select CLKSRC_MMIO
@@ -1018,8 +1008,6 @@ source "arch/arm/mach-exynos4/Kconfig"
source "arch/arm/mach-shmobile/Kconfig"
source "arch/arm/plat-stmp3xxx/Kconfig"
source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-u300/Kconfig"