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.patch34
1 files changed, 10 insertions, 24 deletions
diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 9d8d495..0b1e8d8 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -9,24 +9,10 @@
* linux/src/drivers/net/sis900.h: Likewise.
-Index: i386/README-Drivers
-===================================================================
---- i386/README-Drivers.orig 2006-10-15 20:39:23.000000000 +0300
-+++ i386/README-Drivers 2006-10-25 23:55:33.000000000 +0300
-@@ -365,6 +365,9 @@ Sundance ST201 "Alta" PCI Ethernet
- Winbond W89c840 PCI Ethernet
- --disable-winbond-840 net/winbond-840.c
-
-+SiS 900
-+ --enable-sis900 net/sis900.c
-+
- *** pcmcia bridge drivers
-
- All source files are relative to [GNU Mach]/linux/pcmcia-cs.
Index: 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 2006-10-25 23:55:33.000000000 +0300
++++ linux/dev/drivers/net/Space.c 2007-02-11 15:07:05.000000000 +0200
@@ -93,6 +93,7 @@ extern int yellowfin_probe(struct device
extern int eepro100_probe(struct device *);
extern int epic100_probe(struct device *);
@@ -48,7 +34,7 @@ Index: linux/dev/drivers/net/Space.c
Index: linux/src/drivers/net/sis900.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.c 2006-10-25 23:55:33.000000000 +0300
++++ linux/src/drivers/net/sis900.c 2007-02-11 15:07:05.000000000 +0200
@@ -0,0 +1,1803 @@
+/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
+ Copyright 1999 Silicon Integrated System Corporation
@@ -1856,7 +1842,7 @@ Index: linux/src/drivers/net/sis900.c
Index: linux/src/drivers/net/sis900.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.h 2006-10-25 23:55:33.000000000 +0300
++++ linux/src/drivers/net/sis900.h 2007-02-11 15:07:05.000000000 +0200
@@ -0,0 +1,284 @@
+/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
+ * Copyright 1999 Silicon Integrated System Corporation
@@ -2144,8 +2130,8 @@ Index: linux/src/drivers/net/sis900.h
+#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write a PHY register */
Index: linux/configfrag.ac
===================================================================
---- linux/configfrag.ac.orig 2006-10-25 23:57:48.000000000 +0300
-+++ linux/configfrag.ac 2006-10-25 23:59:16.000000000 +0300
+--- linux/configfrag.ac.orig 2007-02-11 14:51:18.000000000 +0200
++++ linux/configfrag.ac 2007-02-11 15:07:05.000000000 +0200
@@ -423,6 +423,10 @@ AC_Linux_DRIVER([seeq8005],
[Ethernet controller Seeq8005],
[CONFIG_SEEQ8005],
@@ -2159,10 +2145,10 @@ Index: linux/configfrag.ac
[CONFIG_SK_G16],
Index: linux/Makefrag.am
===================================================================
---- linux/Makefrag.am.orig 2006-10-25 23:59:36.000000000 +0300
-+++ linux/Makefrag.am 2006-10-26 00:00:48.000000000 +0300
-@@ -449,6 +449,11 @@ liblinux_a_SOURCES += \
- linux/src/drivers/net/seeq8005.c
+--- linux/Makefrag.am.orig 2007-02-11 14:51:17.000000000 +0200
++++ linux/Makefrag.am 2007-02-11 15:07:05.000000000 +0200
+@@ -524,6 +524,11 @@ liblinux_a_SOURCES += \
+ linux/src/drivers/net/seeq8005.h
endif
+if device_driver_sis900
@@ -2172,4 +2158,4 @@ Index: linux/Makefrag.am
+
if device_driver_sk_g16
liblinux_a_SOURCES += \
- linux/src/drivers/net/sk_g16.c
+ linux/src/drivers/net/sk_g16.c \