r1017 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

Joshua Kwan joshk@haydn.debian.org
Wed, 11 Aug 2004 15:35:43 -0600


Author: joshk
Date: 2004-08-11 15:35:31 -0600 (Wed, 11 Aug 2004)
New Revision: 1017

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/028_bttv_wintvd.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/029_hid_manufacturer.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/999_spelling_mistakes.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
more splits


Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/028_bttv_wintvd.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/028_bttv_wintvd.diff	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/028_bttv_wintvd.diff	2004-08-11 21:35:31 UTC (rev 1017)
@@ -0,0 +1,14 @@
+diff -urN kernel-source-2.4.26/drivers/media/video/bttv-cards.c kernel-source-2.4.26-1/drivers/media/video/bttv-cards.c
+--- kernel-source-2.4.26/drivers/media/video/bttv-cards.c	2003-11-29 05:26:20.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/media/video/bttv-cards.c	2004-04-03 18:05:15.000000000 +1000
+@@ -2375,8 +2375,8 @@
+         { TUNER_TEMIC_4039FR5_NTSC, "Temic 4039FR5" },
+         { TUNER_PHILIPS_FQ1216ME,   "Philips FQ1216 ME" },
+         { TUNER_TEMIC_4066FY5_PAL_I, "Temic 4066FY5" },
+-        { TUNER_ABSENT,        "Philips TD1536" },
+-        { TUNER_ABSENT,        "Philips TD1536D" },
++        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
++        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
+ 	{ TUNER_PHILIPS_NTSC,  "Philips FMR1236" }, /* mono radio */
+         { TUNER_ABSENT,        "Philips FI1256MP" },
+         { TUNER_ABSENT,        "Samsung TCPQ9091P" },

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/029_hid_manufacturer.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/029_hid_manufacturer.diff	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/029_hid_manufacturer.diff	2004-08-11 21:35:31 UTC (rev 1017)
@@ -0,0 +1,34 @@
+diff -urN kernel-source-2.4.26/drivers/usb/hid-core.c kernel-source-2.4.26-1/drivers/usb/hid-core.c
+--- kernel-source-2.4.26/drivers/usb/hid-core.c	2004-04-14 23:05:32.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/usb/hid-core.c	2004-04-17 14:24:00.000000000 +1000
+@@ -1342,20 +1342,18 @@
+ 		hid->out[n].dr.wIndex = cpu_to_le16(hid->ifnum);
+ 	}
+ 
+-	hid->name[0] = 0;
+-
+-	if (!(buf = kmalloc(63, GFP_KERNEL)))
+-		return NULL;
+-
+-	if (usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) {
+-		strcat(hid->name, buf);
+-		if (usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0)
+-			sprintf(hid->name, "%s %s", hid->name, buf);
+-	} else
++	buf = hid->name;
++	*buf = 0;
++	n = usb_string(dev, dev->descriptor.iManufacturer, buf, 63);
++	if (n > 0)
++		buf += n + 1;
++	if (usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) {
++		if (n > 0)
++			buf[-1] = ' ';
++	}
++	if (!*hid->name)
+ 		sprintf(hid->name, "%04x:%04x", dev->descriptor.idVendor, dev->descriptor.idProduct);
+ 
+-	kfree(buf);
+-
+ 	FILL_CONTROL_URB(&hid->urbout, dev, usb_sndctrlpipe(dev, 0),
+ 		(void*) &hid->out[0].dr, hid->out[0].buffer, 1, hid_ctrl, hid);
+ 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff	2004-08-11 21:35:31 UTC (rev 1017)
@@ -0,0 +1,23 @@
+diff -urN kernel-source-2.4.26/drivers/usb/pegasus.c kernel-source-2.4.26-1/drivers/usb/pegasus.c
+--- kernel-source-2.4.26/drivers/usb/pegasus.c	2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/usb/pegasus.c	2004-02-22 20:28:27.000000000 +1100
+@@ -1005,8 +1005,6 @@
+ {
+ 	pegasus_t *pegasus = net->priv;
+ 
+-	netif_stop_queue(net);
+-
+ 	if (net->flags & IFF_PROMISC) {
+ 		pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
+ 		info("%s: Promiscuous mode enabled", net->name);
+@@ -1022,8 +1020,6 @@
+ 
+ 	pegasus->flags |= ETH_REGS_CHANGE;
+ 	ctrl_callback(pegasus->ctrl_urb);
+-
+-	netif_wake_queue(net);
+ }
+ 
+ static u8 mii_phy_probe(pegasus_t * pegasus)
+
+

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff	2004-08-11 21:35:31 UTC (rev 1017)
@@ -0,0 +1,17 @@
+diff -urN kernel-source-2.4.26/drivers/scsi/dpt_i3o.c kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c
+--- kernel-source-2.4.26/drivers/scsi/dpt_i2o.c	2003-06-14 00:51:36.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c	2003-06-01 20:43:49.000000000 +1000
+@@ -81,9 +81,9 @@
+ #elif defined(__ia64__)
+ 	PROC_INTEL, PROC_IA64,
+ #elif defined(__sparc__)
+-	PROC_ULTRASPARC,
++	PROC_ULTRASPARC, PROC_ULTRASPARC,
+ #elif defined(__alpha__)
+-	PROC_ALPHA ,
++	PROC_ALPHA, PROC_ALPHA,
+ #else
+ 	(-1),(-1)
+ #endif
+
+

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/999_spelling_mistakes.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/999_spelling_mistakes.diff	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/999_spelling_mistakes.diff	2004-08-11 21:35:31 UTC (rev 1017)
@@ -10,8 +10,8 @@
   *    drivers/s390/Config.in
   *    drivers/s390/block/Makefile
   *    include/linux/blk.h
---- Documentation/usb/sl811hc.txt~	2004-08-11 11:02:28.000000000 -0700
-+++ Documentation/usb/sl811hc.txt	2004-08-11 11:12:31.000000000 -0700
+--- a/Documentation/usb/sl811hc.txt	2004-08-11 11:02:28.000000000 -0700
++++ b/Documentation/usb/sl811hc.txt	2004-08-11 11:12:31.000000000 -0700
 @@ -2,12 +2,12 @@
  ================================================
  

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-11 20:00:00 UTC (rev 1016)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-11 21:35:31 UTC (rev 1017)
@@ -318,18 +318,6 @@
  DEVICE NUMBER REGISTRY
  P:	H. Peter Anvin
  M:	hpa@zytor.com
-diff -urN kernel-source-2.4.26/Makefile kernel-source-2.4.26-1/Makefile
---- kernel-source-2.4.26/Makefile	2004-04-14 23:05:41.000000000 +1000
-+++ kernel-source-2.4.26-1/Makefile	2004-04-17 14:23:30.000000000 +1000
-@@ -500,7 +505,7 @@
- ifdef CONFIG_MODVERSIONS
- 	$(MAKE) update-modverfile
- endif
--	scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
-+	find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print | xargs scripts/mkdep -- > .hdepend
- 	scripts/mkdep -- init/*.c > .depend
- 
- ifdef CONFIG_MODVERSIONS
 diff -urN kernel-source-2.4.26/README.Debian kernel-source-2.4.26-1/README.Debian
 --- kernel-source-2.4.26/README.Debian	1970-01-01 10:00:00.000000000 +1000
 +++ kernel-source-2.4.26-1/README.Debian	2004-04-18 18:26:35.000000000 +1000
@@ -393,13 +381,16 @@
 +* Fixed pegasus_set_multicast lockup.
 +* Fixed dead lock on shutdown in 8139too.
 +* Don't kill page cache entries in set_blocksize.
-+* Fixed handling of HIDs with product strings bug no manufacturer.
+
 +* Fixed the use of return values from mem*_io in drivers/isdn/sc.
 +* Fixed compile error in drivers/scsi/dpt_i2o.c on alpha.
 +* Extern inline -> static inline in drivers/net/hamradio/soundmodem.
 +* Added asm/io.h for in*/out* to drivers/net/wan/farsync.c.
 +* Corrected AdvWriteDWordLramNoSwap in drivers/scsi/advansys.c.
 +* Always call complete after unlinking an urb in drivers/usb/host/usb-ohci.c.
++* Fixed boundary checks for GUSAGE/SUSAGE in drivers/usb/hiddev.c.
++* Fixed copy_to_user usage in drivers/usb/hiddev.c.
++* Fixed handling of HIDs with product strings bug no manufacturer.
 +* Set time fields to zero in fs/cramfs/inode.c.
 +* Fixed umsdos_solve_hlink oops in fs/umsdos/dir.c.
 +* Made CONFIG_PARIDE_EPATC8 into a runtime option.
@@ -440,10 +431,7 @@
 +  (Andrew Morton).
 +* Black listed "TOSHIBA CD-ROM XM-1702BC" in drivers/ide/ide-dma.c
 +  (Moritz Lennert).
-+* Fixed tuner support on WinTV-D boards in drivers/media/video/bttv-cards.c
-+  (2.6).
-+* Fixed boundary checks for GUSAGE/SUSAGE in drivers/usb/hiddev.c.
-+* Fixed copy_to_user usage in drivers/usb/hiddev.c.
+
 +
 +Changes to comments and documentation:
 +
@@ -6178,20 +6166,7 @@
 +void dm_stripe_exit(void);
 +
 +#endif
-diff -urN kernel-source-2.4.26/drivers/media/video/bttv-cards.c kernel-source-2.4.26-1/drivers/media/video/bttv-cards.c
---- kernel-source-2.4.26/drivers/media/video/bttv-cards.c	2003-11-29 05:26:20.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/media/video/bttv-cards.c	2004-04-03 18:05:15.000000000 +1000
-@@ -2375,8 +2375,8 @@
-         { TUNER_TEMIC_4039FR5_NTSC, "Temic 4039FR5" },
-         { TUNER_PHILIPS_FQ1216ME,   "Philips FQ1216 ME" },
-         { TUNER_TEMIC_4066FY5_PAL_I, "Temic 4066FY5" },
--        { TUNER_ABSENT,        "Philips TD1536" },
--        { TUNER_ABSENT,        "Philips TD1536D" },
-+        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
-+        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
- 	{ TUNER_PHILIPS_NTSC,  "Philips FMR1236" }, /* mono radio */
-         { TUNER_ABSENT,        "Philips FI1256MP" },
-         { TUNER_ABSENT,        "Samsung TCPQ9091P" },
+
 diff -urN kernel-source-2.4.26/drivers/mtd/maps/Config.in kernel-source-2.4.26-1/drivers/mtd/maps/Config.in
 --- kernel-source-2.4.26/drivers/mtd/maps/Config.in	2003-06-14 00:51:34.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/mtd/maps/Config.in	2003-06-01 20:43:47.000000000 +1000
@@ -6430,57 +6405,7 @@
  	ahc_unlock(ahc, &s);
  }
  
-diff -urN kernel-source-2.4.26/drivers/scsi/dpt_i3o.c kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c
---- kernel-source-2.4.26/drivers/scsi/dpt_i2o.c	2003-06-14 00:51:36.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c	2003-06-01 20:43:49.000000000 +1000
-@@ -81,9 +81,9 @@
- #elif defined(__ia64__)
- 	PROC_INTEL, PROC_IA64,
- #elif defined(__sparc__)
--	PROC_ULTRASPARC,
-+	PROC_ULTRASPARC, PROC_ULTRASPARC,
- #elif defined(__alpha__)
--	PROC_ALPHA ,
-+	PROC_ALPHA, PROC_ALPHA,
- #else
- 	(-1),(-1)
- #endif
 
-
-diff -urN kernel-source-2.4.26/drivers/usb/hid-core.c kernel-source-2.4.26-1/drivers/usb/hid-core.c
---- kernel-source-2.4.26/drivers/usb/hid-core.c	2004-04-14 23:05:32.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/usb/hid-core.c	2004-04-17 14:24:00.000000000 +1000
-@@ -1342,20 +1342,18 @@
- 		hid->out[n].dr.wIndex = cpu_to_le16(hid->ifnum);
- 	}
- 
--	hid->name[0] = 0;
--
--	if (!(buf = kmalloc(63, GFP_KERNEL)))
--		return NULL;
--
--	if (usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) {
--		strcat(hid->name, buf);
--		if (usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0)
--			sprintf(hid->name, "%s %s", hid->name, buf);
--	} else
-+	buf = hid->name;
-+	*buf = 0;
-+	n = usb_string(dev, dev->descriptor.iManufacturer, buf, 63);
-+	if (n > 0)
-+		buf += n + 1;
-+	if (usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) {
-+		if (n > 0)
-+			buf[-1] = ' ';
-+	}
-+	if (!*hid->name)
- 		sprintf(hid->name, "%04x:%04x", dev->descriptor.idVendor, dev->descriptor.idProduct);
- 
--	kfree(buf);
--
- 	FILL_CONTROL_URB(&hid->urbout, dev, usb_sndctrlpipe(dev, 0),
- 		(void*) &hid->out[0].dr, hid->out[0].buffer, 1, hid_ctrl, hid);
- 
 diff -urN kernel-source-2.4.26/drivers/usb/host/usb-ohci.c kernel-source-2.4.26-1/drivers/usb/host/usb-ohci.c
 --- kernel-source-2.4.26/drivers/usb/host/usb-ohci.c	2004-04-14 23:05:33.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/usb/host/usb-ohci.c	2004-04-17 14:24:00.000000000 +1000
@@ -6510,29 +6435,7 @@
  	} else {
  		spin_unlock_irqrestore(&ohci->ohci_lock, flags);
  	}
-diff -urN kernel-source-2.4.26/drivers/usb/pegasus.c kernel-source-2.4.26-1/drivers/usb/pegasus.c
---- kernel-source-2.4.26/drivers/usb/pegasus.c	2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/usb/pegasus.c	2004-02-22 20:28:27.000000000 +1100
-@@ -1005,8 +1005,6 @@
- {
- 	pegasus_t *pegasus = net->priv;
- 
--	netif_stop_queue(net);
--
- 	if (net->flags & IFF_PROMISC) {
- 		pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
- 		info("%s: Promiscuous mode enabled", net->name);
-@@ -1022,8 +1020,6 @@
- 
- 	pegasus->flags |= ETH_REGS_CHANGE;
- 	ctrl_callback(pegasus->ctrl_urb);
--
--	netif_wake_queue(net);
- }
- 
- static u8 mii_phy_probe(pegasus_t * pegasus)
 
-
 diff -urN kernel-source-2.4.26/fs/Config.in kernel-source-2.4.26-1/fs/Config.in
 --- kernel-source-2.4.26/fs/Config.in	2004-02-19 00:36:31.000000000 +1100
 +++ kernel-source-2.4.26-1/fs/Config.in	2004-04-17 13:32:34.000000000 +1000