aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/serverworks.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/serverworks.c')
-rw-r--r--drivers/ide/pci/serverworks.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index f495253b7d41..c11880b0709f 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -31,12 +31,10 @@
31#include <linux/types.h> 31#include <linux/types.h>
32#include <linux/module.h> 32#include <linux/module.h>
33#include <linux/kernel.h> 33#include <linux/kernel.h>
34#include <linux/ioport.h>
35#include <linux/pci.h> 34#include <linux/pci.h>
36#include <linux/hdreg.h> 35#include <linux/hdreg.h>
37#include <linux/ide.h> 36#include <linux/ide.h>
38#include <linux/init.h> 37#include <linux/init.h>
39#include <linux/delay.h>
40 38
41#include <asm/io.h> 39#include <asm/io.h>
42 40
@@ -346,13 +344,8 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
346 hwif->set_dma_mode = &svwks_set_dma_mode; 344 hwif->set_dma_mode = &svwks_set_dma_mode;
347 hwif->udma_filter = &svwks_udma_filter; 345 hwif->udma_filter = &svwks_udma_filter;
348 346
349 if (!hwif->dma_base) 347 if (dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE)
350 return; 348 hwif->cable_detect = ata66_svwks;
351
352 if (dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
353 if (hwif->cbl != ATA_CBL_PATA40_SHORT)
354 hwif->cbl = ata66_svwks(hwif);
355 }
356} 349}
357 350
358#define IDE_HFLAGS_SVWKS \ 351#define IDE_HFLAGS_SVWKS \