Move xen patchset to new version's subdir.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.kernel.org / gdth-section-conflict

diff --git a/src/patches/suse-2.6.27.25/patches.kernel.org/gdth-section-conflict b/src/patches/suse-2.6.27.25/patches.kernel.org/gdth-section-conflict
deleted file mode 100644 (file)
index 77f4989..0000000
--- a/src/patches/suse-2.6.27.25/patches.kernel.org/gdth-section-conflict
+++ /dev/null
@@ -1,130 +0,0 @@
-Subject: gdth: Fixup section annotations
-From: Hannes Reinecke <hare@suse.de>
-Date: Tue Sep 30 12:33:53 2008 +0200:
-Git: 833d622ac5002b5bcbcaae4dee335d3e80b84f28
-
-Fixup section annotations so that kbuild doesn't complain anymore.
-
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-
-diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
-index 822d521..273e974 100644
---- a/drivers/scsi/gdth.c
-+++ b/drivers/scsi/gdth.c
-@@ -328,7 +328,7 @@ static int irq[MAXHA] __initdata =
- {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
- /* disable driver flag */
--static int disable __initdata = 0;
-+static int disable = 0;
- /* reserve flag */
- static int reserve_mode = 1;                  
- /* reserve list */
-@@ -589,7 +589,7 @@ static struct pci_driver gdth_pci_driver = {
-       .remove         = gdth_pci_remove_one,
- };
- 
--static void gdth_pci_remove_one(struct pci_dev *pdev)
-+static void __devexit gdth_pci_remove_one(struct pci_dev *pdev)
- {
-       gdth_ha_str *ha = pci_get_drvdata(pdev);
- 
-@@ -601,7 +601,7 @@ static void gdth_pci_remove_one(struct pci_dev *pdev)
-       pci_disable_device(pdev);
- }
- 
--static int gdth_pci_init_one(struct pci_dev *pdev,
-+static int __devinit gdth_pci_init_one(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
- {
-       ushort vendor = pdev->vendor;
-@@ -659,7 +659,7 @@ static int gdth_pci_init_one(struct pci_dev *pdev,
- #endif /* CONFIG_PCI */
- 
- #ifdef CONFIG_EISA
--static int __init gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha)
-+static int __devinit gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha)
- {
-     ulong32 retries,id;
-     unchar prot_ver,eisacf,i,irq_found;
-@@ -753,7 +753,7 @@ static int __init gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha)
- #endif /* CONFIG_EISA */
- 
- #ifdef CONFIG_ISA
--static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha)
-+static int __devinit gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha)
- {
-     register gdt2_dpram_str __iomem *dp2_ptr;
-     int i;
-@@ -854,7 +854,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha)
- #endif /* CONFIG_ISA */
- 
- #ifdef CONFIG_PCI
--static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
-+static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
-                                  gdth_ha_str *ha)
- {
-     register gdt6_dpram_str __iomem *dp6_ptr;
-@@ -1238,7 +1238,7 @@ static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
- 
- /* controller protocol functions */
- 
--static void __init gdth_enable_int(gdth_ha_str *ha)
-+static void __devinit gdth_enable_int(gdth_ha_str *ha)
- {
-     ulong flags;
-     gdt2_dpram_str __iomem *dp2_ptr;
-@@ -1554,7 +1554,7 @@ static int gdth_internal_cmd(gdth_ha_str *ha, unchar service, ushort opcode,
- 
- /* search for devices */
- 
--static int __init gdth_search_drives(gdth_ha_str *ha)
-+static int __devinit gdth_search_drives(gdth_ha_str *ha)
- {
-     ushort cdev_cnt, i;
-     int ok;
-@@ -4654,7 +4654,7 @@ static struct scsi_host_template gdth_template = {
- };
- 
- #ifdef CONFIG_ISA
--static int __init gdth_isa_probe_one(ulong32 isa_bios)
-+static int __devinit gdth_isa_probe_one(ulong32 isa_bios)
- {
-       struct Scsi_Host *shp;
-       gdth_ha_str *ha;
-@@ -4786,7 +4786,7 @@ static int __init gdth_isa_probe_one(ulong32 isa_bios)
- #endif /* CONFIG_ISA */
- 
- #ifdef CONFIG_EISA
--static int __init gdth_eisa_probe_one(ushort eisa_slot)
-+static int __devinit gdth_eisa_probe_one(ushort eisa_slot)
- {
-       struct Scsi_Host *shp;
-       gdth_ha_str *ha;
-@@ -4919,7 +4919,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot)
- #endif /* CONFIG_EISA */
- 
- #ifdef CONFIG_PCI
--static int gdth_pci_probe_one(gdth_pci_str *pcistr,
-+static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,
-                            gdth_ha_str **ha_out)
- {
-       struct Scsi_Host *shp;
-@@ -5122,7 +5122,7 @@ static struct notifier_block gdth_notifier = {
-     gdth_halt, NULL, 0
- };
- 
--static int __init gdth_init(void)
-+static int __devinit gdth_init(void)
- {
-       if (disable) {
-               printk("GDT-HA: Controller driver disabled from"
-@@ -5176,7 +5176,7 @@ static int __init gdth_init(void)
-       return 0;
- }
- 
--static void __exit gdth_exit(void)
-+static void __devexit gdth_exit(void)
- {
-       gdth_ha_str *ha;
-