diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 17:29:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 17:29:34 -0400 |
| commit | db973ffa11030e032acde47b4d6e958064311166 (patch) | |
| tree | 912d103141f625e32ccda709a4b9a854e3a3e696 /drivers/ide/ide-iops.c | |
| parent | dd286422fefdcff784e8d336deeb88ce817e14db (diff) | |
| parent | cafa027b8cc6f605ccebc43a960644307a12d8dd (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:
cs5520: disable VDMA
ide/Kconfig: couple of fixes
alim15x3: remove WDC_ALI15X3 config option
alim15x3: add "wdc_udma" module parameter
alim15x3: remove stale warning about ATI RS100 northbridge
alim15x3: trivial cleanup for ali_set_pio_mode()
make ide-iops.c:SELECT_MASK() static
SWARM IDE: Fix up following changes to ide_hwif_t
Diffstat (limited to 'drivers/ide/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 57d9a9a79a6f..0daf923541ff 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -95,7 +95,7 @@ void SELECT_DRIVE (ide_drive_t *drive) | |||
| 95 | hwif->OUTB(drive->select.all, hwif->io_ports.device_addr); | 95 | hwif->OUTB(drive->select.all, hwif->io_ports.device_addr); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | void SELECT_MASK (ide_drive_t *drive, int mask) | 98 | static void SELECT_MASK(ide_drive_t *drive, int mask) |
| 99 | { | 99 | { |
| 100 | const struct ide_port_ops *port_ops = drive->hwif->port_ops; | 100 | const struct ide_port_ops *port_ops = drive->hwif->port_ops; |
| 101 | 101 | ||