aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 12:03:12 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 12:03:12 +0000
commitafaf27aa826d49a96ee38307da6cbd13e7295a97 (patch)
treee15b211e3413ee42515fd26a3601e14bb30d0837 /target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
parent053c95515a9978da0f79023785e489760d12d69f (diff)
downloadupstream-afaf27aa826d49a96ee38307da6cbd13e7295a97.tar.gz
upstream-afaf27aa826d49a96ee38307da6cbd13e7295a97.tar.bz2
upstream-afaf27aa826d49a96ee38307da6cbd13e7295a97.zip
refresh kernel patches
SVN-Revision: 11209
Diffstat (limited to 'target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch')
-rw-r--r--target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch38
1 files changed, 19 insertions, 19 deletions
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 7753126de0..0985258c31 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,7 @@
-Index: linux-2.6.21gum/drivers/net/smc911x.c
+Index: linux-2.6.21.7/drivers/net/smc911x.c
===================================================================
---- linux-2.6.21gum.orig/drivers/net/smc911x.c
-+++ linux-2.6.21gum/drivers/net/smc911x.c
+--- linux-2.6.21.7.orig/drivers/net/smc911x.c
++++ linux-2.6.21.7/drivers/net/smc911x.c
@@ -76,6 +76,7 @@ static const char version[] =
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
@@ -154,10 +154,10 @@ 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
+Index: linux-2.6.21.7/drivers/net/gumstix-smc911x.c
===================================================================
--- /dev/null
-+++ linux-2.6.21gum/drivers/net/gumstix-smc911x.c
++++ linux-2.6.21.7/drivers/net/gumstix-smc911x.c
@@ -0,0 +1,148 @@
+/*
+ * Gumstix SMC911x chip intialization driver
@@ -307,11 +307,11 @@ 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
+Index: linux-2.6.21.7/drivers/net/Kconfig
===================================================================
---- linux-2.6.21gum.orig/drivers/net/Kconfig
-+++ linux-2.6.21gum/drivers/net/Kconfig
-@@ -897,6 +897,13 @@ config SMC911X
+--- linux-2.6.21.7.orig/drivers/net/Kconfig
++++ linux-2.6.21.7/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 +325,11 @@ 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
+Index: linux-2.6.21.7/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
+--- linux-2.6.21.7.orig/drivers/net/Makefile
++++ linux-2.6.21.7/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 +337,10 @@ 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
+Index: linux-2.6.21.7/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
+--- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/gumstix.h
++++ linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
@@ -52,7 +52,7 @@
#define GPIO_GUMSTIX_ETH0_RST 80
#define GPIO_GUMSTIX_ETH0 36
@@ -350,10 +350,10 @@ 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
+Index: linux-2.6.21.7/drivers/net/smc911x.h
===================================================================
---- linux-2.6.21gum.orig/drivers/net/smc911x.h
-+++ linux-2.6.21gum/drivers/net/smc911x.h
+--- linux-2.6.21.7.orig/drivers/net/smc911x.h
++++ linux-2.6.21.7/drivers/net/smc911x.h
@@ -33,7 +33,9 @@
* Use the DMA feature on PXA chips
*/