summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-16 16:26:59 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-16 16:26:59 +0000
commit997b9010f22c6ac1e290b09c5387ef9511cf5555 (patch)
treed9ad72dc2b03db46e91232865f2428acaf339568 /target/linux
parent5d1772a97b8d77a30121714db275a71ba88e38f4 (diff)
ixp4xx: update 2.6.35 patches to 2.6.35-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22239 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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 1b8ee89c9..d87738097 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