diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
commit | ab47d507d2ff2b0846433bc3c77de03c995258f6 (patch) | |
tree | eaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch | |
parent | 2154d8cde2088958a3c5f221bac76dfb8c9da600 (diff) | |
download | upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.gz upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.bz2 upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.zip |
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch index 6d04a4c64b..81010f9e80 100644 --- a/target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.27/180-tw5334_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -158,6 +158,14 @@ +@@ -158,6 +158,14 @@ config ARCH_PRPMC1100 PrPCM1100 Processor Mezanine Module. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -17,7 +17,7 @@ prompt "NAS100D" --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile -@@ -22,6 +22,7 @@ +@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER) += sid obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o @@ -25,7 +25,7 @@ obj-y += common.o -@@ -42,6 +43,7 @@ +@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o @@ -272,7 +272,7 @@ +subsys_initcall(tw5334_pci_init); --- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h +++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -42,7 +42,8 @@ +@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set */ if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001() || machine_is_wg302v2() || |