diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/ata/pata_radisys.c | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/ata/pata_radisys.c')
| -rw-r--r-- | drivers/ata/pata_radisys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c index 0b0aa452de14..695d44ae52c6 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c | |||
| @@ -81,7 +81,6 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
| 81 | * radisys_set_dmamode - Initialize host controller PATA DMA timings | 81 | * radisys_set_dmamode - Initialize host controller PATA DMA timings |
| 82 | * @ap: Port whose timings we are configuring | 82 | * @ap: Port whose timings we are configuring |
| 83 | * @adev: Device to program | 83 | * @adev: Device to program |
| 84 | * @isich: True if the device is an ICH and has IOCFG registers | ||
| 85 | * | 84 | * |
| 86 | * Set MWDMA mode for device, in host controller PCI config space. | 85 | * Set MWDMA mode for device, in host controller PCI config space. |
| 87 | * | 86 | * |