summaryrefslogtreecommitdiff
path: root/debian/patches/12_sis900.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/12_sis900.patch')
-rw-r--r--debian/patches/12_sis900.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 034182b..5d999cf 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -9,10 +9,10 @@
* linux/src/drivers/net/sis900.h: Likewise.
-Index: linux/dev/drivers/net/Space.c
+Index: b/linux/dev/drivers/net/Space.c
===================================================================
---- linux/dev/drivers/net/Space.c.orig 2006-02-01 22:58:10.000000000 +0200
-+++ linux/dev/drivers/net/Space.c 2007-04-05 07:30:59.000000000 +0300
+--- a/linux/dev/drivers/net/Space.c
++++ b/linux/dev/drivers/net/Space.c
@@ -93,6 +93,7 @@ extern int yellowfin_probe(struct device
extern int eepro100_probe(struct device *);
extern int epic100_probe(struct device *);
@@ -31,10 +31,10 @@ Index: linux/dev/drivers/net/Space.c
#ifdef CONFIG_VIA_RHINE
&& via_rhine_probe(dev)
#endif
-Index: linux/src/drivers/net/sis900.c
+Index: b/linux/src/drivers/net/sis900.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.c 2007-04-05 07:31:00.000000000 +0300
+--- /dev/null
++++ b/linux/src/drivers/net/sis900.c
@@ -0,0 +1,1803 @@
+/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
+ Copyright 1999 Silicon Integrated System Corporation
@@ -1839,10 +1839,10 @@ Index: linux/src/drivers/net/sis900.c
+}
+
+#endif /* MODULE */
-Index: linux/src/drivers/net/sis900.h
+Index: b/linux/src/drivers/net/sis900.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.h 2007-04-05 07:31:00.000000000 +0300
+--- /dev/null
++++ b/linux/src/drivers/net/sis900.h
@@ -0,0 +1,284 @@
+/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
+ * Copyright 1999 Silicon Integrated System Corporation
@@ -2128,11 +2128,11 @@ Index: linux/src/drivers/net/sis900.h
+#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Get the PHY in use. */
+#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read a PHY register. */
+#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write a PHY register */
-Index: linux/configfrag.ac
+Index: b/linux/configfrag.ac
===================================================================
---- linux/configfrag.ac.orig 2007-03-06 06:37:45.000000000 +0200
-+++ linux/configfrag.ac 2007-04-05 07:31:00.000000000 +0300
-@@ -420,6 +420,10 @@ AC_Linux_DRIVER([seeq8005],
+--- a/linux/configfrag.ac
++++ b/linux/configfrag.ac
+@@ -431,6 +431,10 @@ AC_Linux_DRIVER([seeq8005],
[Ethernet controller Seeq8005],
[CONFIG_SEEQ8005],
[net])
@@ -2143,10 +2143,10 @@ Index: linux/configfrag.ac
AC_Linux_DRIVER([sk_g16],
[Ethernet controller Schneider & Koch G16],
[CONFIG_SK_G16],
-Index: linux/Makefrag.am
+Index: b/linux/Makefrag.am
===================================================================
---- linux/Makefrag.am.orig 2007-03-06 06:37:45.000000000 +0200
-+++ linux/Makefrag.am 2007-04-05 07:31:00.000000000 +0300
+--- a/linux/Makefrag.am
++++ b/linux/Makefrag.am
@@ -526,6 +526,11 @@ liblinux_a_SOURCES += \
linux/src/drivers/net/seeq8005.h
endif