X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7188c772bb19ef7ecd0deeae8db4a7e7f308a7ad..8d8ca107998df90aa1c246df3772c52fbf52b6ef:/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch?ds=sidebyside

diff --git a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
index c029ceda1..689d7a3c7 100644
--- a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
-===================================================================
---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig	2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig	2008-03-12 21:21:26.000000000 +1030
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
 @@ -65,6 +65,14 @@
  	  Engineering Pronghorn Metro Platform. For more
  	  information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -17,10 +15,8 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
  config ARCH_IXDP425
  	bool "IXDP425"
  	help
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
-===================================================================
---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile	2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile	2008-03-12 21:21:26.000000000 +1030
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
 @@ -17,6 +17,7 @@
  obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
@@ -29,17 +25,16 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
  
  obj-y	+= common.o
  
-@@ -32,5 +33,6 @@
+@@ -32,6 +33,7 @@
  obj-$(CONFIG_MACH_WG302V2)	+= wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)		+= fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)	+= pronghornmetro-setup.o
 +obj-$(CONFIG_MACH_COMPEX)	+= compex-setup.o
  
  obj-$(CONFIG_PCI)		+= $(obj-pci-$(CONFIG_PCI)) common-pci.o
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c	2008-03-12 21:21:26.000000000 +1030
+ obj-$(CONFIG_IXP4XX_QMGR)	+= ixp4xx_qmgr.o
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/compex-setup.c
 @@ -0,0 +1,120 @@
 +/*
 + * arch/arm/mach-ixp4xx/compex-setup.c
@@ -161,10 +156,8 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
 +	.init_machine	= compex_init,
 +MACHINE_END
 +#endif
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
-===================================================================
---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c	2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c	2008-03-12 21:21:26.000000000 +1030
+--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
 @@ -66,7 +66,7 @@
  int __init ixdp425_pci_init(void)
  {
@@ -174,11 +167,9 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
  		pci_common_init(&ixdp425_pci);
  	return 0;
  }
-Index: linux-2.6.24/arch/arm/tools/mach-types
-===================================================================
---- linux-2.6.24.orig/arch/arm/tools/mach-types	2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/arch/arm/tools/mach-types	2008-03-12 21:21:26.000000000 +1030
-@@ -1278,7 +1278,7 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1276,7 +1276,7 @@
  smdk6400		MACH_SMDK6400		SMDK6400		1270
  nokia_n800		MACH_NOKIA_N800		NOKIA_N800		1271
  greenphone		MACH_GREENPHONE		GREENPHONE		1272