Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / ide / arm / ide_arm.c

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 9efd7a86db450e8cb3e2650a0e9bc3d0756546e2..f728f2927b5a03a9ed4d1c8086ba67c9da350810 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -11,13 +11,12 @@
 #include <linux/init.h>
 #include <linux/ide.h>
 
-#include <asm/mach-types.h>
 #include <asm/irq.h>
 
 #define DRV_NAME "ide_arm"
 
 #ifdef CONFIG_ARCH_CLPS7500
-# include <asm/arch/hardware.h>
+# include <mach/hardware.h>
 #
 # define IDE_ARM_IO    (ISASLOT_IO + 0x1f0)
 # define IDE_ARM_IRQ   IRQ_ISA_14
@@ -28,7 +27,6 @@
 
 static int __init ide_arm_init(void)
 {
-       struct ide_host *host;
        unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
@@ -50,11 +48,7 @@ static int __init ide_arm_init(void)
        hw.irq = IDE_ARM_IRQ;
        hw.chipset = ide_generic;
 
-       host = ide_host_alloc(NULL, hws);
-       if (host)
-               ide_host_register(host, NULL, hws);
-
-       return 0;
+       return ide_host_add(NULL, hws, NULL);
 }
 
 module_init(ide_arm_init);