aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-07-16 16:26:59 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-07-16 16:26:59 +0000
commit30b022c3bdf221c48ad29bb8abc4e8d95f542169 (patch)
treeb9718245e3c27740a402246ef072c2026b2bd9f7 /target/linux/ixp4xx
parent883e39cf8fce54882d896264f4ed11eb952074cf (diff)
downloadupstream-30b022c3bdf221c48ad29bb8abc4e8d95f542169.tar.gz
upstream-30b022c3bdf221c48ad29bb8abc4e8d95f542169.tar.bz2
upstream-30b022c3bdf221c48ad29bb8abc4e8d95f542169.zip
ixp4xx: update 2.6.35 patches to 2.6.35-rc5
SVN-Revision: 22239
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-2.6.35/185-mi424wr_support.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.35/185-mi424wr_support.patch b/target/linux/ixp4xx/patches-2.6.35/185-mi424wr_support.patch
index 1b8ee89c9a..d87738097d 100644
--- a/target/linux/ixp4xx/patches-2.6.35/185-mi424wr_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/185-mi424wr_support.patch
@@ -455,11 +455,11 @@
config IXP4XX_INDIRECT_PCI
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -172,6 +172,7 @@ CONFIG_MACH_FSG=y
- CONFIG_CPU_IXP46X=y
- CONFIG_CPU_IXP43X=y
+@@ -26,6 +26,7 @@ CONFIG_MACH_NAS100D=y
+ CONFIG_MACH_DSMG600=y
+ CONFIG_MACH_FSG=y
CONFIG_MACH_GTWX5715=y
+CONFIG_MACH_MI424WR=y
-
- #
- # IXP4xx Options
+ CONFIG_IXP4XX_QMGR=y
+ CONFIG_IXP4XX_NPE=y
+ # CONFIG_ARM_THUMB is not set