r1016 - 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 14:00:15 -0600


Author: joshk
Date: 2004-08-11 14:00:00 -0600 (Wed, 11 Aug 2004)
New Revision: 1016

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
this stuff got merged in already, remove it

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 18:52:31 UTC (rev 1015)
+++ 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)
@@ -1512,43 +1512,6 @@
    tristate       '  Testing module' CONFIG_CRYPTO_TEST
  fi
 
-diff -urN kernel-source-2.4.26/drivers/block/cpqarray.c kernel-source-2.4.26-1/drivers/block/cpqarray.c
---- kernel-source-2.4.26/drivers/block/cpqarray.c	2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/block/cpqarray.c	2004-02-22 20:28:13.000000000 +1100
-@@ -331,14 +331,6 @@
- MODULE_PARM(eisa, "1-8i");
- EXPORT_NO_SYMBOLS;
- 
--/* This is a bit of a hack... */
--int __init init_cpqarray_module(void)
--{
--	if (cpqarray_init() == 0) /* all the block dev numbers already used */
--		return -ENODEV;	  /* or no controllers were found */
--	return 0;
--}
--
- static void release_io_mem(ctlr_info_t *c)
- {
- 	/* if IO mem was not protected do nothing */
-@@ -2467,6 +2459,18 @@
- 
- }
- 
-+/* This is a bit of a hack... */
-+int __init init_cpqarray_module(void)
-+{
-+	if (cpqarray_init() == 0) {
-+		/* all the block dev numbers already used
-+		 * or no controllers were found */
-+        	pci_unregister_driver(&cpqarray_pci_driver);
-+		return -ENODEV;	 
-+	}
-+	return 0;
-+}
-+
- static void __exit cleanup_cpqarray_module(void)
- {
-         int i;
 diff -urN kernel-source-2.4.26/drivers/block/paride/epat.c kernel-source-2.4.26-1/drivers/block/paride/epat.c
 --- kernel-source-2.4.26/drivers/block/paride/epat.c	2002-11-29 10:53:12.000000000 +1100
 +++ kernel-source-2.4.26-1/drivers/block/paride/epat.c	2002-11-30 16:25:11.000000000 +1100
@@ -1647,28 +1610,6 @@
       	ring->space = ring->head - (ring->tail+8);
       	if (ring->space < 0) ring->space += ring->Size;
  }
-diff -urN kernel-source-2.4.26/drivers/hotplug/Makefile kernel-source-2.4.26-1/drivers/hotplug/Makefile
---- kernel-source-2.4.26/drivers/hotplug/Makefile	2003-08-25 21:44:41.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/hotplug/Makefile	2004-04-17 08:17:42.000000000 +1000
-@@ -18,7 +18,6 @@
- 
- cpqphp-objs		:=	cpqphp_core.o	\
- 				cpqphp_ctrl.o	\
--				cpqphp_proc.o	\
- 				cpqphp_pci.o
- 
- ibmphp-objs		:=	ibmphp_core.o	\
-@@ -36,6 +35,10 @@
- 	cpqphp-objs += cpqphp_nvram.o
- endif
- 
-+ifeq ($(CONFIG_PROC_FS),y)
-+	cpqphp-objs += cpqphp_proc.o
-+endif
-+
- 
- include $(TOPDIR)/Rules.make
- 
 diff -urN kernel-source-2.4.26/drivers/ide/Config.in kernel-source-2.4.26-1/drivers/ide/Config.in
 --- kernel-source-2.4.26/drivers/ide/Config.in	2004-04-14 23:05:29.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/ide/Config.in	2004-04-17 14:23:47.000000000 +1000
@@ -2040,72 +1981,6 @@
  	{ "CD-532E-A"		,	"ALL"		},
  	{ "E-IDE CD-ROM CR-840",	"ALL"		},
  	{ "CD-ROM Drive/F5A",	"ALL"		},
-diff -urN kernel-source-2.4.26/drivers/ide/ide-probe.c kernel-source-2.4.26-1/drivers/ide/ide-probe.c
---- kernel-source-2.4.26/drivers/ide/ide-probe.c	2004-04-14 23:05:29.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/ide/ide-probe.c	2004-04-17 14:23:47.000000000 +1000
-@@ -1425,12 +1425,16 @@
- 
- 	if (ideprobe_done)
-     		return -EBUSY;
--	
-+
-+	ide_xlate_1024_hook = ide_xlate_1024;
-+#ifdef CONFIG_BLK_DEV_IDEPCI
-+	ide_scan_pcibus();
-+#endif /* CONFIG_BLK_DEV_IDEPCI */
- 	for (index = 0; index < MAX_HWIFS; ++index)
- 		ide_unregister(index);
- 	ideprobe_init();
- 	create_proc_ide_interfaces();
--	ide_xlate_1024_hook = ide_xlate_1024;
-+	ide_driver_module(1);
- 	ideprobe_done++;
- 	return 0;
- }
-diff -urN kernel-source-2.4.26/drivers/ide/ide-proc.c kernel-source-2.4.26-1/drivers/ide/ide-proc.c
---- kernel-source-2.4.26/drivers/ide/ide-proc.c	2004-04-14 23:05:29.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/ide/ide-proc.c	2004-04-17 14:23:48.000000000 +1000
-@@ -895,6 +895,16 @@
- EXPORT_SYMBOL(destroy_proc_ide_interfaces);
- 
- #ifdef CONFIG_BLK_DEV_IDEPCI
-+static inline void create_pci_proc_entry(ide_pci_host_proc_t *p)
-+{
-+	if (p->name == NULL || p->set != 1 || p->get_info == NULL) 
-+		return;
-+
-+	p->parent = proc_ide_root;
-+	create_proc_info_entry(p->name, 0, p->parent, p->get_info);
-+	p->set = 2;
-+}
-+
- void ide_pci_register_host_proc (ide_pci_host_proc_t *p)
- {
- 	ide_pci_host_proc_t *tmp;
-@@ -908,6 +918,9 @@
- 		tmp->next = p;
- 	} else
- 		ide_pci_host_proc_list = p;
-+
-+	if (proc_ide_root)
-+		create_pci_proc_entry(p);
- }
- 
- EXPORT_SYMBOL(ide_pci_register_host_proc);
-@@ -931,12 +944,7 @@
- #ifdef CONFIG_BLK_DEV_IDEPCI
- 	while (p != NULL)
- 	{
--		if (p->name != NULL && p->set == 1 && p->get_info != NULL) 
--		{
--			p->parent = proc_ide_root;
--			create_proc_info_entry(p->name, 0, p->parent, p->get_info);
--			p->set = 2;
--		}
-+		create_pci_proc_entry(p);
- 		p = p->next;
- 	}
- #endif /* CONFIG_BLK_DEV_IDEPCI */
 diff -urN kernel-source-2.4.26/drivers/ide/ide.c kernel-source-2.4.26-1/drivers/ide/ide.c
 --- kernel-source-2.4.26/drivers/ide/ide.c	2004-02-19 00:36:31.000000000 +1100
 +++ kernel-source-2.4.26-1/drivers/ide/ide.c	2004-02-22 20:28:18.000000000 +1100