diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 21:33:07 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 21:33:07 +0100 |
commit | 6defd90433729c2d795865165cb34d938d8ff07c (patch) | |
tree | ebb963c6db463296b8f926d79d7ddc8c1251ca24 /arch/arm/configs | |
parent | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (diff) | |
parent | 99c6bb390cf599b9e0aa6e69beacc4e5d875bf77 (diff) | |
download | linux-stable-6defd90433729c2d795865165cb34d938d8ff07c.tar.gz linux-stable-6defd90433729c2d795865165cb34d938d8ff07c.tar.bz2 linux-stable-6defd90433729c2d795865165cb34d938d8ff07c.zip |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Merge branch 'orion-devel' into devel
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/orion5x_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 4017d83c9d2d..b2456ca544c9 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig @@ -176,14 +176,17 @@ CONFIG_MACH_KUROBOX_PRO=y CONFIG_MACH_DNS323=y CONFIG_MACH_TS209=y CONFIG_MACH_LINKSTATION_PRO=y +CONFIG_MACH_LINKSTATION_MINI=y CONFIG_MACH_TS409=y CONFIG_MACH_WRT350N_V2=y CONFIG_MACH_TS78XX=y CONFIG_MACH_MV2120=y +CONFIG_MACH_EDMINI_V2=y CONFIG_MACH_MSS2=y CONFIG_MACH_WNR854T=y CONFIG_MACH_RD88F5181L_GE=y CONFIG_MACH_RD88F5181L_FXO=y +CONFIG_MACH_RD88F6183AP_GE=y # # Boot options |