Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[pandora-kernel.git] / drivers / ide / legacy / ide-cs.c

diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 41a2e25..27b1e0b 100644 (file)
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -152,6 +152,11 @@ static const struct ide_port_ops idecs_port_ops = {
        .quirkproc              = ide_undecoded_slave,
 };
 
        .quirkproc              = ide_undecoded_slave,
 };
 

+static const struct ide_port_info idecs_port_info = {
+       .port_ops               = &idecs_port_ops,
+       .host_flags             = IDE_HFLAG_NO_DMA,
+};
+

 static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
                                unsigned long irq, struct pcmcia_device *handle)
 {
 static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
                                unsigned long irq, struct pcmcia_device *handle)
 {


@@ -185,13 +190,11 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
 
     i = hwif->index;
 
 
     i = hwif->index;
 

-    ide_init_port_data(hwif, i);

     ide_init_port_hw(hwif, &hw);
     ide_init_port_hw(hwif, &hw);

-    hwif->port_ops = &idecs_port_ops;

 
     idx[0] = i;
 
 
     idx[0] = i;
 

-    ide_device_add(idx, NULL);
+    ide_device_add(idx, &idecs_port_info);

 
     if (hwif->present)
        return hwif;
 
     if (hwif->present)
        return hwif;