diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/configs/kirkwood_defconfig | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/configs/kirkwood_defconfig')
| -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 |