diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /drivers/ide/serverworks.c | |
| parent | bzip2/lzma: centralize format detection (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2 (diff) | |
| download | linux-dev-b17304245f0db0ac69b795c411407808f3f2796d.tar.xz linux-dev-b17304245f0db0ac69b795c411407808f3f2796d.zip | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'drivers/ide/serverworks.c')
| -rw-r--r-- | drivers/ide/serverworks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c index 437bc919dafd..382102ba467b 100644 --- a/drivers/ide/serverworks.c +++ b/drivers/ide/serverworks.c @@ -151,7 +151,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) static const u8 dma_modes[] = { 0x77, 0x21, 0x20 }; static const u8 drive_pci2[] = { 0x45, 0x44, 0x47, 0x46 }; - ide_hwif_t *hwif = HWIF(drive); + ide_hwif_t *hwif = drive->hwif; struct pci_dev *dev = to_pci_dev(hwif->dev); u8 unit = drive->dn & 1; |