diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 15:34:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 15:34:33 -0400 |
| commit | 8eb224cd45239714c2be104f17d5ca16b6b5d7ac (patch) | |
| tree | ce422db6d98c43d38e2cd552095ef67c9f601492 /drivers/ide/ppc/pmac.c | |
| parent | 063a0b38a7e4ade79f00314c473d3c41a2c7eecf (diff) | |
| parent | 7e77718579f44d654e299c0fc2096b6b50f14458 (diff) | |
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
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 78c9eeb85634..d9ca52e6cdab 100644 --- 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) | |||
| 1771 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 1771 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ |
| 1772 | 1772 | ||
| 1773 | module_init(pmac_ide_probe); | 1773 | module_init(pmac_ide_probe); |
| 1774 | |||
| 1775 | MODULE_LICENSE("GPL"); | ||