diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
commit | 9285574b20298c1499aedee162f5659e1e356862 (patch) | |
tree | d5f50bfbd765bba8d95d15fa170f7d487a7d1d49 /target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch | |
parent | f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (diff) | |
download | mtk-20170518-9285574b20298c1499aedee162f5659e1e356862.zip mtk-20170518-9285574b20298c1499aedee162f5659e1e356862.tar.gz mtk-20170518-9285574b20298c1499aedee162f5659e1e356862.tar.bz2 |
refresh ixp4xx patches to match upstream style
SVN-Revision: 11297
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch index ccbfe28..d6d7cf6 100644 --- a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ b/arch/arm/mach-ixp4xx/ap1000-setup.c @@ -0,0 +1,151 @@ +/* + * arch/arm/mach-ixp4xx/ap1000-setup.c @@ -154,11 +152,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c + .init_machine = ap1000_init, +MACHINE_END +#endif -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c -=================================================================== ---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c -@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = { +--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c +@@ -66,7 +66,8 @@ int __init ixdp425_pci_init(void) { if (machine_is_ixdp425() || machine_is_ixcdp1100() || @@ -168,11 +164,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c pci_common_init(&ixdp425_pci); return 0; } -Index: linux-2.6.25.4/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 -@@ -89,6 +89,14 @@ config MACH_WRT300NV2 +--- a/arch/arm/mach-ixp4xx/Kconfig ++++ b/arch/arm/mach-ixp4xx/Kconfig +@@ -89,6 +89,14 @@ WRT300N v2 router. For more information on this platform, see http://openwrt.org @@ -187,11 +181,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.25.4/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 -@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += +--- a/arch/arm/mach-ixp4xx/Makefile ++++ b/arch/arm/mach-ixp4xx/Makefile +@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o @@ -199,7 +191,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO) += pro +@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o |