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 /drivers/serial | |
| 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 '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 211c21797ce..8b2c619a09f 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
| 34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | 36 | ||
| 37 | #include <asm/arch/svinto.h> | 37 | #include <arch/svinto.h> |
| 38 | 38 | ||
| 39 | /* non-arch dependent serial structures are in linux/serial.h */ | 39 | /* non-arch dependent serial structures are in linux/serial.h */ |
| 40 | #include <linux/serial.h> | 40 | #include <linux/serial.h> |
| 41 | /* while we keep our own stuff (struct e100_serial) in a local .h file */ | 41 | /* while we keep our own stuff (struct e100_serial) in a local .h file */ |
| 42 | #include "crisv10.h" | 42 | #include "crisv10.h" |
| 43 | #include <asm/fasttimer.h> | 43 | #include <asm/fasttimer.h> |
| 44 | #include <asm/arch/io_interface_mux.h> | 44 | #include <arch/io_interface_mux.h> |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER | 46 | #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER |
| 47 | #ifndef CONFIG_ETRAX_FAST_TIMER | 47 | #ifndef CONFIG_ETRAX_FAST_TIMER |
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index e3c5c8c3c09..f36a729280b 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/circ_buf.h> | 10 | #include <linux/circ_buf.h> |
| 11 | #include <asm/termios.h> | 11 | #include <asm/termios.h> |
| 12 | #include <asm/dma.h> | 12 | #include <asm/dma.h> |
| 13 | #include <asm/arch/io_interface_mux.h> | 13 | #include <arch/io_interface_mux.h> |
| 14 | 14 | ||
| 15 | /* Software state per channel */ | 15 | /* Software state per channel */ |
| 16 | 16 | ||