From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Fri, 16 Jul 2010 16:26:59 +0000 (+0000)
Subject: ixp4xx: update 2.6.35 patches to 2.6.35-rc5
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=30b022c3bdf221c48ad29bb8abc4e8d95f542169;p=openwrt%2Fstaging%2Frobimarko.git

ixp4xx: update 2.6.35 patches to 2.6.35-rc5

SVN-Revision: 22239
---

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