diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/ide/pci/triflex.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
| download | kernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.zip kernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz kernel_goldelico_gta04-35438c4327df18dbf5e7f597b69299119f4a14de.tar.bz2 | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/ide/pci/triflex.c')
| -rw-r--r-- | drivers/ide/pci/triflex.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index 024bbfa..098692a 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c @@ -115,6 +115,9 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif) hwif->tuneproc = &triflex_tune_drive; hwif->speedproc = &triflex_tune_chipset; + if (hwif->dma_base == 0) + return; + hwif->atapi_dma = 1; hwif->mwdma_mask = 0x07; hwif->swdma_mask = 0x07; |