diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /arch/arm/configs | |
| parent | ceb0885d3b01bb2e2f18765770e212914f2864be (diff) | |
| parent | a20df564d15bd28e3df24e1c65b885bd74d23f17 (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index f2e3a9088df6..ccc9c9959b82 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
| @@ -13,11 +13,19 @@ CONFIG_MACH_RD88F6192_NAS=y | |||
| 13 | CONFIG_MACH_RD88F6281=y | 13 | CONFIG_MACH_RD88F6281=y |
| 14 | CONFIG_MACH_MV88F6281GTW_GE=y | 14 | CONFIG_MACH_MV88F6281GTW_GE=y |
| 15 | CONFIG_MACH_SHEEVAPLUG=y | 15 | CONFIG_MACH_SHEEVAPLUG=y |
| 16 | CONFIG_MACH_ESATA_SHEEVAPLUG=y | ||
| 17 | CONFIG_MACH_GURUPLUG=y | ||
| 16 | CONFIG_MACH_TS219=y | 18 | CONFIG_MACH_TS219=y |
| 17 | CONFIG_MACH_TS41X=y | 19 | CONFIG_MACH_TS41X=y |
| 18 | CONFIG_MACH_OPENRD_BASE=y | 20 | CONFIG_MACH_OPENRD_BASE=y |
| 19 | CONFIG_MACH_OPENRD_CLIENT=y | 21 | CONFIG_MACH_OPENRD_CLIENT=y |
| 22 | CONFIG_MACH_OPENRD_ULTIMATE=y | ||
| 20 | CONFIG_MACH_NETSPACE_V2=y | 23 | CONFIG_MACH_NETSPACE_V2=y |
| 24 | CONFIG_MACH_INETSPACE_V2=y | ||
| 25 | CONFIG_MACH_NETSPACE_MAX_V2=y | ||
| 26 | CONFIG_MACH_NET2BIG_V2=y | ||
| 27 | CONFIG_MACH_NET5BIG_V2=y | ||
| 28 | CONFIG_MACH_T5325=y | ||
| 21 | # CONFIG_CPU_FEROCEON_OLD_ID is not set | 29 | # CONFIG_CPU_FEROCEON_OLD_ID is not set |
| 22 | CONFIG_NO_HZ=y | 30 | CONFIG_NO_HZ=y |
| 23 | CONFIG_HIGH_RES_TIMERS=y | 31 | CONFIG_HIGH_RES_TIMERS=y |