Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: use ->ata_input_data in ide_driveid_update() ide-h8300: 32-bit I/O is unsupported ide/legacy/q40ide.c: add MODULE_LICENSE ide/legacy/macide: add MODULE_LICENSE ide/legacy/falconide.c: add MODULE_LICENSE ide/legacy/buddha.c: add MODULE_LICENSE ide/legacy/gayle.c: add MODULE_LICENSE ide/h8300/ide-h8300.c: add MODULE_LICENSE ide/cris/ide-cris.c: add MODULE_LICENSE ide/arm/ide_arm.c: add MODULE_LICENSE ide/ppc/pmac.c: add MODULE_LICENSE ide/ppc/mpc8xx.c: add MODULE_LICENSE ide/pci/cmd640.c: add MODULE_LICENSE ide-pnp.c: add MODULE_LICENSE
aarch64-laptops · Apr 2, 2008 · 8eb224c · 8eb224c
2 parents 063a0b3 + 7e77718
commit 8eb224c
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 1 deletion.
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
@@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
 }
 
 module_init(ide_arm_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
 }
 
 module_init(init_e100_ide);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
@@ -110,6 +110,7 @@ static int __init h8300_ide_init(void)
 	ide_init_port_data(hwif, index);
 	ide_init_port_hw(hwif, &hw);
 	hwif_setup(hwif);
+	hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;
 	printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index);
 
 	idx[0] = index;
@@ -125,3 +126,5 @@ static int __init h8300_ide_init(void)
 }
 
 module_init(h8300_ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
@@ -658,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive)
 		local_irq_restore(flags);
 		return 0;
 	}
-	ata_input_data(drive, id, SECTOR_WORDS);
+	hwif->ata_input_data(drive, id, SECTOR_WORDS);
 	(void)ide_read_status(drive);	/* clear drive IRQ */
 	local_irq_enable();
 	local_irq_restore(flags);

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)
 
 module_init(pnpide_init);
 module_exit(pnpide_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
@@ -241,3 +241,5 @@ static int __init buddha_init(void)
 }
 
 module_init(buddha_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
@@ -93,3 +93,5 @@ static int __init falconide_init(void)
 }
 
 module_init(falconide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
@@ -195,3 +195,5 @@ static int __init gayle_init(void)
 }
 
 module_init(gayle_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
@@ -137,3 +137,5 @@ static int __init macide_init(void)
 }
 
 module_init(macide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
@@ -153,3 +153,5 @@ static int __init q40ide_init(void)
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
@@ -881,3 +881,5 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0);
 MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");
 
 module_init(cmd640x_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
@@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
 }
 
 module_init(mpc8xx_ide_probe);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
@@ -1771,3 +1771,5 @@ static int __devinit pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
		}

		module_init(ide_arm_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
		}

		module_init(init_e100_ide);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)

		module_init(pnpide_init);
		module_exit(pnpide_exit);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -241,3 +241,5 @@ static int __init buddha_init(void)
		}

		module_init(buddha_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,3 +93,5 @@ static int __init falconide_init(void)
		}

		module_init(falconide_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -195,3 +195,5 @@ static int __init gayle_init(void)
		}

		module_init(gayle_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -137,3 +137,5 @@ static int __init macide_init(void)
		}

		module_init(macide_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -153,3 +153,5 @@ static int __init q40ide_init(void)
		}

		module_init(q40ide_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -881,3 +881,5 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0);
		MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");

		module_init(cmd640x_init);

		MODULE_LICENSE("GPL");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
		}

		module_init(mpc8xx_ide_probe);

		MODULE_LICENSE("GPL");