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 8a3bb23f8ae7a17313ca44f48c9ced52828b494b..f728f2927b5a03a9ed4d1c8086ba67c9da350810 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -16,7 +16,7 @@
 #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