diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:06:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:06:51 -0400 |
| commit | f60f700876cd51de9de69f3a3c865d95e287a24d (patch) | |
| tree | 4ef50e96c385ed076465aac23f52902467e7d825 /drivers/serial | |
| parent | c6c621b3a977b20d7ceffd3debcacbe3de7c0e87 (diff) | |
| parent | 6d283d271674b1127881ebf082266a2c3fe6e0e4 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/crisv10.c | 2 | ||||
| -rw-r--r-- | drivers/serial/icom.c | 1 | ||||
| -rw-r--r-- | drivers/serial/jsm/jsm.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 3da5494953af..23b8871e74cc 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -426,8 +426,6 @@ | |||
| 426 | static char *serial_version = "$Revision: 1.25 $"; | 426 | static char *serial_version = "$Revision: 1.25 $"; |
| 427 | 427 | ||
| 428 | #include <linux/config.h> | 428 | #include <linux/config.h> |
| 429 | #include <linux/version.h> | ||
| 430 | |||
| 431 | #include <linux/types.h> | 429 | #include <linux/types.h> |
| 432 | #include <linux/errno.h> | 430 | #include <linux/errno.h> |
| 433 | #include <linux/signal.h> | 431 | #include <linux/signal.h> |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 546a0bc77e1e..c112b32764e8 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #define SERIAL_DO_RESTART | 25 | #define SERIAL_DO_RESTART |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/config.h> | 27 | #include <linux/config.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/signal.h> | 30 | #include <linux/signal.h> |
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index 777829fa3300..5bf3c45521f4 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #define __JSM_DRIVER_H | 28 | #define __JSM_DRIVER_H |
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/version.h> | ||
| 32 | #include <linux/types.h> /* To pick up the varions Linux types */ | 31 | #include <linux/types.h> /* To pick up the varions Linux types */ |
| 33 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
| 34 | #include <linux/serial_core.h> | 33 | #include <linux/serial_core.h> |