diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/arch-v10/kernel/io_interface_mux.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/arch-v10/kernel/io_interface_mux.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/io_interface_mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/io_interface_mux.c b/arch/cris/arch-v10/kernel/io_interface_mux.c index add98e0941b5..29f97e962795 100644 --- a/arch/cris/arch-v10/kernel/io_interface_mux.c +++ b/arch/cris/arch-v10/kernel/io_interface_mux.c | |||
| @@ -11,9 +11,9 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | 13 | ||
| 14 | #include <asm/arch/svinto.h> | 14 | #include <arch/svinto.h> |
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/arch/io_interface_mux.h> | 16 | #include <arch/io_interface_mux.h> |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #define DBG(s) | 19 | #define DBG(s) |