[kernel] r8127 - dists/sid/linux-2.6/debian/patches/debian/dfsg
Frederik Schüler
fs at alioth.debian.org
Fri Jan 5 18:07:42 CET 2007
Author: fs
Date: Fri Jan 5 18:07:41 2007
New Revision: 8127
Modified:
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
Log:
Rediff patches, I used the wrong tree
Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch Fri Jan 5 18:07:41 2007
@@ -1,7 +1,7 @@
diff -ruN a/drivers/media/Kconfig b/drivers/media/Kconfig
---- a/drivers/media/Kconfig 2007-01-05 14:55:19.000000000 +0000
-+++ b/drivers/media/Kconfig 2007-01-05 14:55:33.000000000 +0000
-@@ -83,18 +83,4 @@
+--- a/drivers/media/Kconfig 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/media/Kconfig 2007-01-05 16:43:58.000000000 +0000
+@@ -82,18 +82,4 @@
config VIDEO_TVEEPROM
tristate
@@ -21,9 +21,9 @@
-
endmenu
diff -ruN a/drivers/media/video/Makefile b/drivers/media/video/Makefile
---- a/drivers/media/video/Makefile 2007-01-05 14:54:35.000000000 +0000
-+++ b/drivers/media/video/Makefile 2007-01-05 14:54:50.000000000 +0000
-@@ -92,7 +92,6 @@
+--- a/drivers/media/video/Makefile 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/media/video/Makefile 2007-01-05 16:43:45.000000000 +0000
+@@ -76,7 +76,6 @@
obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch Fri Jan 5 18:07:41 2007
@@ -1,7 +1,7 @@
diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
---- a/drivers/net/Kconfig 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/net/Kconfig 2007-01-05 15:13:26.000000000 +0000
-@@ -1460,21 +1460,6 @@
+--- a/drivers/net/Kconfig 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/net/Kconfig 2007-01-05 16:45:01.000000000 +0000
+@@ -1430,21 +1430,6 @@
tristate "TOSHIBA TC35815 Ethernet support"
depends on NET_PCI && PCI && TOSHIBA_JMR3927
@@ -24,9 +24,9 @@
tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
depends on NET_PCI && PCI
diff -ruN a/drivers/net/Makefile b/drivers/net/Makefile
---- a/drivers/net/Makefile 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/net/Makefile 2007-01-05 15:13:10.000000000 +0000
-@@ -38,7 +38,6 @@
+--- a/drivers/net/Makefile 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/net/Makefile 2007-01-05 16:45:01.000000000 +0000
+@@ -41,7 +41,6 @@
obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch Fri Jan 5 18:07:41 2007
@@ -1,6 +1,6 @@
diff -ruN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
---- a/drivers/usb/misc/Kconfig 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/usb/misc/Kconfig 2007-01-05 15:22:14.000000000 +0000
+--- a/drivers/usb/misc/Kconfig 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/usb/misc/Kconfig 2007-01-05 17:02:19.000000000 +0000
@@ -4,34 +4,6 @@
comment "USB Miscellaneous drivers"
depends on USB
@@ -33,18 +33,18 @@
- To compile this driver as a module, choose M here: the
- module will be called emi26.
-
- config USB_ADUTUX
- tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
+ config USB_AUERSWALD
+ tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
depends on USB && EXPERIMENTAL
diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
---- a/drivers/usb/misc/Makefile 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/usb/misc/Makefile 2007-01-05 15:22:03.000000000 +0000
-@@ -7,8 +7,6 @@
+--- a/drivers/usb/misc/Makefile 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/usb/misc/Makefile 2007-01-05 17:01:14.000000000 +0000
+@@ -6,8 +6,6 @@
obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
obj-$(CONFIG_USB_CYTHERM) += cytherm.o
-obj-$(CONFIG_USB_EMI26) += emi26.o
-obj-$(CONFIG_USB_EMI62) += emi62.o
- obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
obj-$(CONFIG_USB_LCD) += usblcd.o
+ obj-$(CONFIG_USB_LD) += ldusb.o
Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch Fri Jan 5 18:07:41 2007
@@ -1,7 +1,7 @@
diff -ruN a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
---- a/drivers/usb/serial/Kconfig 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/usb/serial/Kconfig 2007-01-05 15:44:57.000000000 +0000
-@@ -283,98 +283,6 @@
+--- a/drivers/usb/serial/Kconfig 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/usb/serial/Kconfig 2007-01-05 17:04:16.000000000 +0000
+@@ -274,98 +274,6 @@
To compile this driver as a module, choose M here: the
module will be called keyspan_pda.
@@ -101,9 +101,9 @@
tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
depends on USB_SERIAL && EXPERIMENTAL
diff -ruN a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
---- a/drivers/usb/serial/Makefile 2006-11-29 21:57:37.000000000 +0000
-+++ b/drivers/usb/serial/Makefile 2007-01-05 15:54:10.000000000 +0000
-@@ -29,7 +29,6 @@
+--- a/drivers/usb/serial/Makefile 2006-09-20 03:42:06.000000000 +0000
++++ b/drivers/usb/serial/Makefile 2007-01-05 17:04:16.000000000 +0000
+@@ -28,7 +28,6 @@
obj-$(CONFIG_USB_SERIAL_IPAQ) += ipaq.o
obj-$(CONFIG_USB_SERIAL_IPW) += ipw.o
obj-$(CONFIG_USB_SERIAL_IR) += ir-usb.o
More information about the Kernel-svn-changes
mailing list