diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-12 15:11:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-12 15:11:18 -0400 |
| commit | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (patch) | |
| tree | 4a91a11bcfb7df4bf2344240ac4fb958515f1ac0 /arch/arm/configs | |
| parent | c9ee46a910f6edb40ddb7fb9aeac0030057c6fdb (diff) | |
| parent | af9a2d006611124eb1de9d7fee160b25b252ad98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index ccc9c9959b82..2f7042813765 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
| @@ -15,6 +15,7 @@ CONFIG_MACH_MV88F6281GTW_GE=y | |||
| 15 | CONFIG_MACH_SHEEVAPLUG=y | 15 | CONFIG_MACH_SHEEVAPLUG=y |
| 16 | CONFIG_MACH_ESATA_SHEEVAPLUG=y | 16 | CONFIG_MACH_ESATA_SHEEVAPLUG=y |
| 17 | CONFIG_MACH_GURUPLUG=y | 17 | CONFIG_MACH_GURUPLUG=y |
| 18 | CONFIG_MACH_DOCKSTAR=y | ||
| 18 | CONFIG_MACH_TS219=y | 19 | CONFIG_MACH_TS219=y |
| 19 | CONFIG_MACH_TS41X=y | 20 | CONFIG_MACH_TS41X=y |
| 20 | CONFIG_MACH_OPENRD_BASE=y | 21 | CONFIG_MACH_OPENRD_BASE=y |