summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/floppy.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-05 17:14:15 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-07 10:55:48 +0200
commita09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch)
tree69689f467179891b498bd7423fcf61925173db31 /arch/arm/include/asm/floppy.h
parentMerge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/h... (diff)
downloadlinux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.xz
linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.zip
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/floppy.h')
-rw-r--r--arch/arm/include/asm/floppy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h
index dce20c25ab10..c9f03eccc9d8 100644
--- a/arch/arm/include/asm/floppy.h
+++ b/arch/arm/include/asm/floppy.h
@@ -12,7 +12,7 @@
#ifndef __ASM_ARM_FLOPPY_H
#define __ASM_ARM_FLOPPY_H
#if 0
-#include <asm/arch/floppy.h>
+#include <mach/floppy.h>
#endif
#define fd_outb(val,port) \