Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb224cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 063a0b38 7e777185

drivers/ide/arm/ide_arm.c

+2 −0
Original line number Diff line number Diff line
@@ -46,3 +46,5 @@ static int __init ide_arm_init(void) 
}



module_init(ide_arm_init);



MODULE_LICENSE("GPL");

drivers/ide/cris/ide-cris.c

+2 −0
Original line number Diff line number Diff line
@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive) 
}



module_init(init_e100_ide);



MODULE_LICENSE("GPL");

drivers/ide/h8300/ide-h8300.c

+3 −0
Original line number Diff line number Diff line
@@ -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 @@ out_busy: 
}



module_init(h8300_ide_init);



MODULE_LICENSE("GPL");

drivers/ide/ide-iops.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/ide/ide-pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void) 


module_init(pnpide_init);

module_exit(pnpide_exit);



MODULE_LICENSE("GPL");