Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / ide_arm.c

diff --git a/drivers/ide/ide_arm.c b/drivers/ide/ide_arm.c
index f728f2927b5a03a9ed4d1c8086ba67c9da350810..cf6385446ece9da9a0266bef1ce3f80154f62ead 100644 (file)
--- a/drivers/ide/ide_arm.c
+++ b/drivers/ide/ide_arm.c
@@ -15,15 +15,12 @@
 
 #define DRV_NAME "ide_arm"
 
-#ifdef CONFIG_ARCH_CLPS7500
-# include <mach/hardware.h>
-#
-# define IDE_ARM_IO    (ISASLOT_IO + 0x1f0)
-# define IDE_ARM_IRQ   IRQ_ISA_14
-#else
-# define IDE_ARM_IO    0x1f0
-# define IDE_ARM_IRQ   IRQ_HARDDISK
-#endif
+#define IDE_ARM_IO     0x1f0
+#define IDE_ARM_IRQ    IRQ_HARDDISK
+
+static const struct ide_port_info ide_arm_port_info = {
+       .host_flags             = IDE_HFLAG_NO_DMA,
+};
 
 static int __init ide_arm_init(void)
 {
@@ -48,7 +45,7 @@ static int __init ide_arm_init(void)
        hw.irq = IDE_ARM_IRQ;
        hw.chipset = ide_generic;
 
-       return ide_host_add(NULL, hws, NULL);
+       return ide_host_add(&ide_arm_port_info, hws, NULL);
 }
 
 module_init(ide_arm_init);