git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
floppy.h
diff --git
a/arch/arm/include/asm/floppy.h
b/arch/arm/include/asm/floppy.h
index
dce20c2
..
c9f03ec
100644
(file)
--- 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/ar
ch/floppy.h>
+#include <
ma
ch/floppy.h>
#endif
#define fd_outb(val,port) \