diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 15:41:34 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 15:41:34 -0500 |
| commit | 2a2d10f386c1bacabe1a530c06dc8488eac419e5 (patch) | |
| tree | 4606a4a3bafa42a8aa70e001d35883956a0f0589 /arch/arm/configs | |
| parent | 2f68ffd11aa76b251921976c982b814df9ebe890 (diff) | |
| parent | c499546f43f2c31b681271ef7db922839fcde5fe (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mv78xx0_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index 6afa2c108eaa..da4710dd1da1 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig | |||
| @@ -176,6 +176,7 @@ CONFIG_ARCH_MV78XX0=y | |||
| 176 | # | 176 | # |
| 177 | CONFIG_MACH_DB78X00_BP=y | 177 | CONFIG_MACH_DB78X00_BP=y |
| 178 | CONFIG_MACH_RD78X00_MASA=y | 178 | CONFIG_MACH_RD78X00_MASA=y |
| 179 | CONFIG_MACH_TERASTATION_WXL=y | ||
| 179 | CONFIG_PLAT_ORION=y | 180 | CONFIG_PLAT_ORION=y |
| 180 | 181 | ||
| 181 | # | 182 | # |