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

drivers/ide/arm/ide_arm.c

···
 }
 
 module_init(ide_arm_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/cris/ide-cris.c

···
 }
 
 module_init(init_e100_ide);
+
+MODULE_LICENSE("GPL");

drivers/ide/h8300/ide-h8300.c

···
 	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;
···
 }
 
 module_init(h8300_ide_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/ide-iops.c

···
 		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);

drivers/ide/ide-pnp.c

···
 
 module_init(pnpide_init);
 module_exit(pnpide_exit);
+
+MODULE_LICENSE("GPL");

drivers/ide/legacy/buddha.c

···
 }
 
 module_init(buddha_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/legacy/falconide.c

···
 }
 
 module_init(falconide_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/legacy/gayle.c

···
 }
 
 module_init(gayle_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/legacy/macide.c

···
 }
 
 module_init(macide_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/legacy/q40ide.c

···
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/pci/cmd640.c

···
 MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");
 
 module_init(cmd640x_init);
+
+MODULE_LICENSE("GPL");

drivers/ide/ppc/mpc8xx.c

···
 }
 
 module_init(mpc8xx_ide_probe);
+
+MODULE_LICENSE("GPL");

drivers/ide/ppc/pmac.c

···
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");