leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Linus Torvalds 2008-04-02 12:34:33 -07:00
commit 8eb224cd45
13 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/arm/ide_arm.c
View File

@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
}
module_init(ide_arm_init);
MODULE_LICENSE("GPL");

2
drivers/ide/cris/ide-cris.c
View File

@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
}
module_init(init_e100_ide);
MODULE_LICENSE("GPL");

3
drivers/ide/h8300/ide-h8300.c
View File

@ -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");

2
drivers/ide/ide-iops.c
View File

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

2
drivers/ide/ide-pnp.c
View File

@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)
module_init(pnpide_init);
module_exit(pnpide_exit);
MODULE_LICENSE("GPL");

2
drivers/ide/legacy/buddha.c
View File

@ -241,3 +241,5 @@ fail_base2:
}
module_init(buddha_init);
MODULE_LICENSE("GPL");

2
drivers/ide/legacy/falconide.c
View File

@ -93,3 +93,5 @@ static int __init falconide_init(void)
}
module_init(falconide_init);
MODULE_LICENSE("GPL");

2
drivers/ide/legacy/gayle.c
View File

@ -195,3 +195,5 @@ found:
}
module_init(gayle_init);
MODULE_LICENSE("GPL");

2
drivers/ide/legacy/macide.c
View File

@ -137,3 +137,5 @@ static int __init macide_init(void)
}
module_init(macide_init);
MODULE_LICENSE("GPL");

2
drivers/ide/legacy/q40ide.c
View File

@ -153,3 +153,5 @@ static int __init q40ide_init(void)
}
module_init(q40ide_init);
MODULE_LICENSE("GPL");

2
drivers/ide/pci/cmd640.c
View File

@ -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");

2
drivers/ide/ppc/mpc8xx.c
View File

@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
}
module_init(mpc8xx_ide_probe);
MODULE_LICENSE("GPL");

2
drivers/ide/ppc/pmac.c
View File

@ -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");