summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/ide.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /include/asm-arm/ide.h
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (diff)
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'include/asm-arm/ide.h')
-rw-r--r--include/asm-arm/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index 76da8806b..6bd9d3c02 100644
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -48,4 +48,4 @@ typedef union {
#endif /* __KERNEL__ */
-#endif /* __ASMi386_IDE_H */
+#endif /* __ASMARM_IDE_H */