summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-02 12:21:31 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-02 12:21:31 +0000
commitc1209bde02769789149b5e83840361fce0a2e070 (patch)
treeb60f67d807bfc65af47df8122e26d19ba5a9e212 /target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
parentd50ec0371001b81c5efacab6729b7cb0533d8adf (diff)
downloadmaster-31e0f0ae-c1209bde02769789149b5e83840361fce0a2e070.tar.gz
master-31e0f0ae-c1209bde02769789149b5e83840361fce0a2e070.tar.bz2
master-31e0f0ae-c1209bde02769789149b5e83840361fce0a2e070.zip
refresh 2.6.36 patches
SVN-Revision: 23776
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch b/target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
index d87738097d..d85d3d1132 100644
--- a/target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
@@ -421,7 +421,7 @@
+
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -23,6 +23,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42
+@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o
@@ -429,7 +429,7 @@
obj-y += common.o
-@@ -45,6 +46,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu
+@@ -47,6 +48,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
@@ -439,7 +439,7 @@
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -235,6 +235,13 @@ config MACH_GTWX5715
+@@ -243,6 +243,13 @@ config MACH_GTWX5715
"High Speed" UART is n/c (as far as I can tell)
20 Pin ARM/Xscale JTAG interface on J2