diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/arch-v10/drivers/sync_serial.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
| download | linux-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.gz | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/arch-v10/drivers/sync_serial.c')
| -rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index 91fea623c7c9..6cc1a0319a5d 100644 --- a/arch/cris/arch-v10/drivers/sync_serial.c +++ b/arch/cris/arch-v10/drivers/sync_serial.c @@ -26,11 +26,11 @@ #include <asm/irq.h> #include <asm/dma.h> #include <asm/io.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/sync_serial.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> /* The receiver is a bit tricky beacuse of the continuous stream of data.*/ /* */ |