aboutsummaryrefslogtreecommitdiffstats
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
commit91567f75e2b4fdd0961b319c37ee2a2f66d22958 (patch)
tree7ca0f3f16e0bd3f8c0f9643bca9a9f072a778080 /target/linux/ixp4xx/patches-2.6.36/185-mi424wr_support.patch
parentce8e14c8f7aee407ac3aeaa401f02bec77e623af (diff)
downloadmaster-187ad058-91567f75e2b4fdd0961b319c37ee2a2f66d22958.tar.gz
master-187ad058-91567f75e2b4fdd0961b319c37ee2a2f66d22958.tar.bz2
master-187ad058-91567f75e2b4fdd0961b319c37ee2a2f66d22958.zip
[ixp4xx]: refresh 2.6.36 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23776 3c298f89-4303-0410-b956-a3cf2f4a3e73
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