[kernel] r16407 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Thu Oct  7 01:58:53 2010
New Revision: 16407

Log:
hisax: Disable device aliases that conflict with mISDN

Added:
   dists/sid/linux-2.6/debian/patches/debian/hisax-Disable-device-aliases-that-conflict-with-mISDN.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/25

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Oct  7 01:28:27 2010	(r16406)
+++ dists/sid/linux-2.6/debian/changelog	Thu Oct  7 01:58:53 2010	(r16407)
@@ -6,6 +6,7 @@
   * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
   * linux-image: Include modules.order in image packages (Closes: #598518)
   * [x86] isdn/i4l: Reenable ISDN4Linux drivers, but mark them as staging
+    - hisax: Disable device aliases that conflict with mISDN
 
   [ Stephen R. Marenka ]
   * m68k: fix missing io macros.

Added: dists/sid/linux-2.6/debian/patches/debian/hisax-Disable-device-aliases-that-conflict-with-mISDN.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/hisax-Disable-device-aliases-that-conflict-with-mISDN.patch	Thu Oct  7 01:58:53 2010	(r16407)
@@ -0,0 +1,42 @@
+Subject: [PATCH] hisax: Disable device aliases that conflict with mISDN
+
+These deprecated drivers claim devices that should normally be handled by
+mISDN drivers.
+
+--- a/drivers/isdn/hisax/hfc4s8s_l1.c
++++ b/drivers/isdn/hisax/hfc4s8s_l1.c
+@@ -121,7 +121,6 @@
+ 	{}
+ };
+ 
+-MODULE_DEVICE_TABLE(pci, hfc4s8s_ids);
+ 
+ MODULE_AUTHOR("Werner Cornelius, werner at cornelius-consult.de");
+ MODULE_DESCRIPTION("ISDN layer 1 for Cologne Chip HFC-4S/8S chips");
+--- a/drivers/isdn/hisax/hfc_usb.c
++++ b/drivers/isdn/hisax/hfc_usb.c
+@@ -1604,4 +1604,3 @@
+ MODULE_AUTHOR(DRIVER_AUTHOR);
+ MODULE_DESCRIPTION(DRIVER_DESC);
+ MODULE_LICENSE("GPL");
+-MODULE_DEVICE_TABLE(usb, hfcusb_idtab);
+--- a/drivers/isdn/hisax/config.c
++++ b/drivers/isdn/hisax/config.c
+@@ -1974,7 +1974,6 @@
+ 	{ }				/* Terminating entry */
+ };
+
+-MODULE_DEVICE_TABLE(pci, hisax_pci_tbl);
+ #endif /* CONFIG_PCI */
+ 
+ module_init(HiSax_init);
+--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
++++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
+@@ -66,7 +66,6 @@
+ 	{}
+ };
+ 
+-MODULE_DEVICE_TABLE(pci, fcpci_ids);
+ 
+ #ifdef CONFIG_PNP
+ static struct pnp_device_id fcpnp_ids[] __devinitdata = {

Modified: dists/sid/linux-2.6/debian/patches/series/25
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/25	Thu Oct  7 01:28:27 2010	(r16406)
+++ dists/sid/linux-2.6/debian/patches/series/25	Thu Oct  7 01:58:53 2010	(r16407)
@@ -4,3 +4,4 @@
 + bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch
 + bugfix/m68k/m68k_add_missing_io_macros.patch
 + debian/isdn-i4l-mark-as-staging.patch
++ debian/hisax-Disable-device-aliases-that-conflict-with-mISDN.patch