diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/arch-v32/mach-fs/io.c | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'arch/cris/arch-v32/mach-fs/io.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mach-fs/io.c b/arch/cris/arch-v32/mach-fs/io.c index a03a3ad3a188..cb6327b1f8f8 100644 --- a/arch/cris/arch-v32/mach-fs/io.c +++ b/arch/cris/arch-v32/mach-fs/io.c | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 15 | #include <asm/arch/pinmux.h> | 15 | #include <mach/pinmux.h> |
| 16 | #include <asm/arch/hwregs/gio_defs.h> | 16 | #include <hwregs/gio_defs.h> |
| 17 | 17 | ||
| 18 | #ifndef DEBUG | 18 | #ifndef DEBUG |
| 19 | #define DEBUG(x) | 19 | #define DEBUG(x) |