diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 17:51:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 17:51:51 +0100 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /drivers/serial | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | [CRIS] Move header files from include to arch/cris/include. (diff) | |
| download | linux-0242909a6135e10a28822c64f9ad50fdad52757c.tar.xz linux-0242909a6135e10a28822c64f9ad50fdad52757c.zip | |
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 'drivers/serial')
| -rw-r--r-- | drivers/serial/crisv10.c | 4 | ||||
| -rw-r--r-- | drivers/serial/crisv10.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 211c21797ce0..8b2c619a09f2 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $"; #include <asm/system.h> #include <linux/delay.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* non-arch dependent serial structures are in linux/serial.h */ #include <linux/serial.h> /* while we keep our own stuff (struct e100_serial) in a local .h file */ #include "crisv10.h" #include <asm/fasttimer.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER #ifndef CONFIG_ETRAX_FAST_TIMER diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index e3c5c8c3c09b..f36a729280bc 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h @@ -10,7 +10,7 @@ #include <linux/circ_buf.h> #include <asm/termios.h> #include <asm/dma.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> /* Software state per channel */ |