X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c886d2690dae0258d64fef02d8a24c901f7c2d6b..52196955dfe288cd3e8cf6e68d1f9b843b1636b1:/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch?ds=inline

diff --git a/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch b/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
index 7753126de..7ddfd5fda 100644
--- a/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
+++ b/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21gum/drivers/net/smc911x.c
-===================================================================
---- linux-2.6.21gum.orig/drivers/net/smc911x.c
-+++ linux-2.6.21gum/drivers/net/smc911x.c
+--- a/drivers/net/smc911x.c
++++ b/drivers/net/smc911x.c
 @@ -76,6 +76,7 @@ static const char version[] =
  #include <linux/etherdevice.h>
  #include <linux/skbuff.h>
@@ -154,10 +152,8 @@ Index: linux-2.6.21gum/drivers/net/smc911x.c
  	return platform_driver_register(&smc911x_driver);
  }
  
-Index: linux-2.6.21gum/drivers/net/gumstix-smc911x.c
-===================================================================
 --- /dev/null
-+++ linux-2.6.21gum/drivers/net/gumstix-smc911x.c
++++ b/drivers/net/gumstix-smc911x.c
 @@ -0,0 +1,148 @@
 +/*
 + *  Gumstix SMC911x chip intialization driver
@@ -307,11 +303,9 @@ Index: linux-2.6.21gum/drivers/net/gumstix-smc911x.c
 +MODULE_AUTHOR("Craig Hughes <craig@gumstix.com>");
 +MODULE_DESCRIPTION("Gumstix board SMC911x chip initialization driver");
 +MODULE_VERSION("1:0.1");
-Index: linux-2.6.21gum/drivers/net/Kconfig
-===================================================================
---- linux-2.6.21gum.orig/drivers/net/Kconfig
-+++ linux-2.6.21gum/drivers/net/Kconfig
-@@ -897,6 +897,13 @@ config SMC911X
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -1020,6 +1020,13 @@ config SMC911X
  	  called smc911x.  If you want to compile it as a module, say M 
  	  here and read <file:Documentation/modules.txt>
  
@@ -325,11 +319,9 @@ Index: linux-2.6.21gum/drivers/net/Kconfig
  config NET_VENDOR_RACAL
  	bool "Racal-Interlan (Micom) NI cards"
  	depends on NET_ETHERNET && ISA
-Index: linux-2.6.21gum/drivers/net/Makefile
-===================================================================
---- linux-2.6.21gum.orig/drivers/net/Makefile
-+++ linux-2.6.21gum/drivers/net/Makefile
-@@ -201,6 +201,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -202,6 +202,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
  obj-$(CONFIG_MACB) += macb.o
  
  obj-$(CONFIG_SMC91X_GUMSTIX) += gumstix-smc91x.o
@@ -337,10 +329,8 @@ Index: linux-2.6.21gum/drivers/net/Makefile
  obj-$(CONFIG_ARM) += arm/
  obj-$(CONFIG_DEV_APPLETALK) += appletalk/
  obj-$(CONFIG_TR) += tokenring/
-Index: linux-2.6.21gum/include/asm-arm/arch-pxa/gumstix.h
-===================================================================
---- linux-2.6.21gum.orig/include/asm-arm/arch-pxa/gumstix.h
-+++ linux-2.6.21gum/include/asm-arm/arch-pxa/gumstix.h
+--- a/include/asm-arm/arch-pxa/gumstix.h
++++ b/include/asm-arm/arch-pxa/gumstix.h
 @@ -52,7 +52,7 @@
  #define GPIO_GUMSTIX_ETH0_RST		80
  #define GPIO_GUMSTIX_ETH0		36
@@ -350,10 +340,8 @@ Index: linux-2.6.21gum/include/asm-arm/arch-pxa/gumstix.h
  #define GPIO_GUMSTIX_ETH0		99
  #endif
  #define GPIO_GUMSTIX_ETH1_RST		52
-Index: linux-2.6.21gum/drivers/net/smc911x.h
-===================================================================
---- linux-2.6.21gum.orig/drivers/net/smc911x.h
-+++ linux-2.6.21gum/drivers/net/smc911x.h
+--- a/drivers/net/smc911x.h
++++ b/drivers/net/smc911x.h
 @@ -33,7 +33,9 @@
   * Use the DMA feature on PXA chips
   */