diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 10:58:03 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 10:58:03 +0000 |
| commit | 0fc3447849ba0984e4892fe9cf0006852b65c12d (patch) | |
| tree | 35c6225c1bc7734c4c829fea1aa2f65431a4c066 /target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch | |
| parent | 468bd067074db26753ce7118b04b1eb9c15fe561 (diff) | |
[ixp4xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11204 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch index 3b7ad83c9..e4a8bf5ee 100644 --- a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig @@ -150,6 +150,14 @@ config ARCH_PRPMC1100 PrPCM1100 Processor Mezanine Module. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config MACH_NAS100D bool prompt "NAS100D" -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile @@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42 obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c @@ -0,0 +1,162 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c @@ -204,10 +204,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c + .init_machine = tw5334_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c @@ -0,0 +1,69 @@ +/* + * arch/arch/mach-ixp4xx/tw5334-pci.c @@ -278,10 +278,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c +} + +subsys_initcall(tw5334_pci_init); -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h =================================================================== ---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h -+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h @@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set */ if (machine_is_adi_coyote() || machine_is_gtwx5715() || |