- upgrade to 2.6.15-rc4

- rediff modular-ide.patch

svn path=/dists/trunk/linux-2.6/; revision=4944

debian/arch/config

@@ -738,3 +738,4 @@ CONFIG_MKISS=m
 CONFIG_VIDEO_BT848_DVB=y
 # CONFIG_USB_MIDI is not set
 CONFIG_OBSOLETE_OSS_USB_DRIVER=y
+CONFIG_ATM_DUMMY=m

debian/changelog

@@ -1,4 +1,4 @@
-linux-2.6 (2.6.14+2.6.15-rc3-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) UNRELEASED; urgency=low
 
   [ Frederik Schüler ]
   * New upstream release candidate.

debian/patches-debian/modular-ide.patch

@@ -3,9 +3,9 @@
 ## DP: Patch author: Herbert Xu
 ## DP: Upstream status: rejected
 #
-diff -aurN a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
---- a/drivers/ide/ide-generic.c	2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/ide-generic.c	2005-06-15 22:16:56.000000000 -0400
+diff -ruN source-old/drivers/ide/ide-generic.c source/drivers/ide/ide-generic.c
+--- source-old/drivers/ide/ide-generic.c	2005-10-28 02:02:08.000000000 +0200
++++ source/drivers/ide/ide-generic.c	2005-12-01 14:08:41.000000000 +0100
 @@ -11,9 +11,14 @@
  #include <linux/init.h>
  #include <linux/module.h>
@@ -21,9 +21,9 @@ diff -aurN a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
  	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
  		ide_get_lock(NULL, NULL); /* for atari only */
  
-diff -aurN a/drivers/ide/ide.c b/drivers/ide/ide.c
---- a/drivers/ide/ide.c	2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/ide.c	2005-06-15 22:16:56.000000000 -0400
+diff -ruN source-old/drivers/ide/ide.c source/drivers/ide/ide.c
+--- source-old/drivers/ide/ide.c	2005-12-01 13:56:23.000000000 +0100
++++ source/drivers/ide/ide.c	2005-12-01 14:08:41.000000000 +0100
 @@ -175,10 +175,11 @@
  static int initializing;	/* set while initializing built-in drivers */
  
@@ -37,7 +37,7 @@ diff -aurN a/drivers/ide/ide.c b/drivers/ide/ide.c
  #endif
  
  #ifdef CONFIG_IDEDMA_AUTO
-@@ -1418,6 +1419,8 @@
+@@ -1417,6 +1418,8 @@
  
  EXPORT_SYMBOL(generic_ide_ioctl);
  
@@ -46,7 +46,7 @@ diff -aurN a/drivers/ide/ide.c b/drivers/ide/ide.c
  /*
   * stridx() returns the offset of c within s,
   * or -1 if c is '\0' or not found within s.
-@@ -1797,9 +1800,9 @@
+@@ -1796,9 +1799,9 @@
   */
  static void __init probe_for_hwifs (void)
  {
@@ -59,10 +59,10 @@ diff -aurN a/drivers/ide/ide.c b/drivers/ide/ide.c
  
  #ifdef CONFIG_ETRAX_IDE
  	{
-diff -aurN a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
---- a/drivers/ide/setup-pci.c	2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/setup-pci.c	2005-06-15 22:16:56.000000000 -0400
-@@ -837,7 +837,7 @@
+diff -ruN source-old/drivers/ide/setup-pci.c source/drivers/ide/setup-pci.c
+--- source-old/drivers/ide/setup-pci.c	2005-12-01 11:22:33.000000000 +0100
++++ source/drivers/ide/setup-pci.c	2005-12-01 14:08:41.000000000 +0100
+@@ -840,7 +840,7 @@
   *	boot up the pci layer takes over the job.
   */
   
@@ -71,7 +71,7 @@ diff -aurN a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
  {
  	struct list_head *l;
  	struct pci_driver *d;
-@@ -863,21 +863,23 @@
+@@ -866,21 +866,23 @@
  
  /**
   *	ide_scan_pcibus		-	perform the initial IDE driver scan
@@ -98,16 +98,16 @@ diff -aurN a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
  		while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
  			ide_scan_pcidev(dev);
  		}
-@@ -899,3 +901,5 @@
- 		pci_register_driver(d);
+@@ -902,3 +904,5 @@
+ 		__pci_register_driver(d, d->driver.owner);
  	}
  }
 +
 +EXPORT_SYMBOL_GPL(ide_scan_pcibus);
-diff -aurN a/include/linux/ide.h b/include/linux/ide.h
---- a/include/linux/ide.h	2005-06-06 11:22:29.000000000 -0400
-+++ b/include/linux/ide.h	2005-06-15 22:16:56.000000000 -0400
-@@ -1115,6 +1115,7 @@
+diff -ruN source-old/include/linux/ide.h source/include/linux/ide.h
+--- source-old/include/linux/ide.h	2005-12-01 11:22:35.000000000 +0100
++++ source/include/linux/ide.h	2005-12-01 16:02:36.000000000 +0100
+@@ -1122,6 +1122,7 @@
  extern	ide_hwif_t	ide_hwifs[];		/* master data repository */
  #endif
  extern int noautodma;
@@ -115,12 +115,12 @@ diff -aurN a/include/linux/ide.h b/include/linux/ide.h
  
  extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
  extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs);
-@@ -1323,7 +1324,7 @@
+@@ -1304,7 +1305,7 @@
  
  extern int ideprobe_init(void);
  
 -extern void ide_scan_pcibus(int scan_direction) __init;
 +extern void ide_scan_pcibus(void);
- extern int ide_pci_register_driver(struct pci_driver *driver);
+ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
+ #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
  extern void ide_pci_unregister_driver(struct pci_driver *driver);
- void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);

debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1

@@ -2,7 +2,7 @@
 + fbdev-radeon-noaccel.patch
 + fs-asfs-2.patch
 + ia64-irq-affinity-upfix.patch
-#+ modular-ide.patch
++ modular-ide.patch
 + modular-ide-pnp.patch
 #+ powerpc-calibrate-tau.patch
 #+ powerpc-g3-750cxe.patch