diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /drivers/serial | |
parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/serial')
42 files changed, 1 insertions, 43 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 9fd0de4b7afd..57438326b07f 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | * $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $ | 8 | * $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $ |
9 | */ | 9 | */ |
10 | #include <linux/config.h> | ||
11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
12 | #include <linux/tty.h> | 11 | #include <linux/tty.h> |
13 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index bff94541991c..993a702422ec 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
25 | #include <linux/tty_flip.h> | 25 | #include <linux/tty_flip.h> |
26 | #include <linux/config.h> | ||
27 | #include <linux/major.h> | 26 | #include <linux/major.h> |
28 | #include <linux/string.h> | 27 | #include <linux/string.h> |
29 | #include <linux/fcntl.h> | 28 | #include <linux/fcntl.h> |
diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h index 978f8a609f3d..58aa2154655b 100644 --- a/drivers/serial/68328serial.h +++ b/drivers/serial/68328serial.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _MC683XX_SERIAL_H | 11 | #ifndef _MC683XX_SERIAL_H |
12 | #define _MC683XX_SERIAL_H | 12 | #define _MC683XX_SERIAL_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | struct serial_struct { | 15 | struct serial_struct { |
17 | int type; | 16 | int type; |
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index 9843ae3d420e..e80e70e9b126 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * int rs_360_init(void); | 20 | * int rs_360_init(void); |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index f361b356bd1d..9c5d36f50140 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * mapbase is the physical address of the IO port. | 19 | * mapbase is the physical address of the IO port. |
20 | * membase is an 'ioremapped' cookie. | 20 | * membase is an 'ioremapped' cookie. |
21 | */ | 21 | */ |
22 | #include <linux/config.h> | ||
23 | 22 | ||
24 | #if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 23 | #if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
25 | #define SUPPORT_SYSRQ | 24 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h index 490606b87095..91bd28f2bb47 100644 --- a/drivers/serial/8250.h +++ b/drivers/serial/8250.h | |||
@@ -15,7 +15,6 @@ | |||
15 | * $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $ | 15 | * $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $ |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | #include <linux/serial_8250.h> | 18 | #include <linux/serial_8250.h> |
20 | 19 | ||
21 | struct old_serial_port { | 20 | struct old_serial_port { |
diff --git a/drivers/serial/8250_mca.c b/drivers/serial/8250_mca.c index ac205256d5f3..d10be944ad44 100644 --- a/drivers/serial/8250_mca.c +++ b/drivers/serial/8250_mca.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | #include <linux/config.h> | ||
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
14 | #include <linux/mca.h> | 13 | #include <linux/mca.h> |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index e920d196d0b1..7311d8487c96 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
@@ -31,7 +31,6 @@ | |||
31 | * required, these have to be supplied via some other means (eg, GPIO) | 31 | * required, these have to be supplied via some other means (eg, GPIO) |
32 | * and hooked into this driver. | 32 | * and hooked into this driver. |
33 | */ | 33 | */ |
34 | #include <linux/config.h> | ||
35 | 34 | ||
36 | #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 35 | #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
37 | #define SUPPORT_SYSRQ | 36 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 3d966cfc9a38..a8d7124e84a1 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
@@ -31,7 +31,6 @@ | |||
31 | * required, these have to be supplied via some other means (eg, GPIO) | 31 | * required, these have to be supplied via some other means (eg, GPIO) |
32 | * and hooked into this driver. | 32 | * and hooked into this driver. |
33 | */ | 33 | */ |
34 | #include <linux/config.h> | ||
35 | 34 | ||
36 | #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 35 | #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
37 | #define SUPPORT_SYSRQ | 36 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c index df9500bdaded..7b3b3f3d5101 100644 --- a/drivers/serial/at91_serial.c +++ b/drivers/serial/at91_serial.c | |||
@@ -22,7 +22,6 @@ | |||
22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | #include <linux/config.h> | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/tty.h> | 26 | #include <linux/tty.h> |
28 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 2691112c84ad..f27d852ce50d 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $ | 25 | * $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $ |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | #include <linux/config.h> | ||
29 | 28 | ||
30 | #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 5cba59ad7dc5..90ff96e3339b 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -31,7 +31,6 @@ | |||
31 | * | 31 | * |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/config.h> | ||
35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
37 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index 17406a05ce1f..95afc37297a8 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index cdba128250a9..ef3bb476c432 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index b84137cdeb2b..901be3483455 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
@@ -425,7 +425,6 @@ | |||
425 | 425 | ||
426 | static char *serial_version = "$Revision: 1.25 $"; | 426 | static char *serial_version = "$Revision: 1.25 $"; |
427 | 427 | ||
428 | #include <linux/config.h> | ||
429 | #include <linux/types.h> | 428 | #include <linux/types.h> |
430 | #include <linux/errno.h> | 429 | #include <linux/errno.h> |
431 | #include <linux/signal.h> | 430 | #include <linux/signal.h> |
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index 1800c0e7531a..f30b93d6ef79 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #ifndef _ETRAX_SERIAL_H | 7 | #ifndef _ETRAX_SERIAL_H |
8 | #define _ETRAX_SERIAL_H | 8 | #define _ETRAX_SERIAL_H |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/circ_buf.h> | 10 | #include <linux/circ_buf.h> |
12 | #include <asm/termios.h> | 11 | #include <asm/termios.h> |
13 | 12 | ||
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c index 466d06cc7d37..ecf824bd2d4e 100644 --- a/drivers/serial/dz.c +++ b/drivers/serial/dz.c | |||
@@ -26,7 +26,6 @@ | |||
26 | 26 | ||
27 | #undef DEBUG_DZ | 27 | #undef DEBUG_DZ |
28 | 28 | ||
29 | #include <linux/config.h> | ||
30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 144a7a352b28..ad1e753cbc53 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
@@ -24,7 +24,6 @@ | |||
24 | */ | 24 | */ |
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> | ||
28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
30 | #include <linux/signal.h> | 29 | #include <linux/signal.h> |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index da85bafa0942..0b5f39d038b9 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * [29-Mar-2005] Mike Lee | 25 | * [29-Mar-2005] Mike Lee |
26 | * Added hardware handshake | 26 | * Added hardware handshake |
27 | */ | 27 | */ |
28 | #include <linux/config.h> | ||
29 | 28 | ||
30 | #if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 56b093ecd779..342042889f6e 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org) | 12 | * Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org) |
13 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 13 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
14 | */ | 14 | */ |
15 | #include <linux/config.h> | ||
16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 6a2a25d9b596..fbaae96f4c93 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * membase is an 'ioremapped' cookie. This is compatible with the old | 25 | * membase is an 'ioremapped' cookie. This is compatible with the old |
26 | * serial.c driver, and is currently the preferred form. | 26 | * serial.c driver, and is currently the preferred form. |
27 | */ | 27 | */ |
28 | #include <linux/config.h> | ||
29 | 28 | ||
30 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h index 7c3ec24f7e50..849f1b2c2531 100644 --- a/drivers/serial/m32r_sio.h +++ b/drivers/serial/m32r_sio.h | |||
@@ -15,7 +15,6 @@ | |||
15 | * (at your option) any later version. | 15 | * (at your option) any later version. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | 18 | ||
20 | struct m32r_sio_probe { | 19 | struct m32r_sio_probe { |
21 | struct module *owner; | 20 | struct module *owner; |
diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/serial/m32r_sio_reg.h index 9c864529451b..4671473793e3 100644 --- a/drivers/serial/m32r_sio_reg.h +++ b/drivers/serial/m32r_sio_reg.h | |||
@@ -15,7 +15,6 @@ | |||
15 | #ifndef _M32R_SIO_REG_H | 15 | #ifndef _M32R_SIO_REG_H |
16 | #define _M32R_SIO_REG_H | 16 | #define _M32R_SIO_REG_H |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | 18 | ||
20 | #ifdef CONFIG_SERIAL_M32R_PLDSIO | 19 | #ifdef CONFIG_SERIAL_M32R_PLDSIO |
21 | 20 | ||
diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h index a2b28e8629f9..56420e2cb110 100644 --- a/drivers/serial/mcfserial.h +++ b/drivers/serial/mcfserial.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef _MCF_SERIAL_H | 14 | #ifndef _MCF_SERIAL_H |
15 | #define _MCF_SERIAL_H | 15 | #define _MCF_SERIAL_H |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
19 | 18 | ||
20 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 1aa34844218c..1b8e554f674f 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -44,7 +44,6 @@ | |||
44 | * will be mapped to. | 44 | * will be mapped to. |
45 | */ | 45 | */ |
46 | 46 | ||
47 | #include <linux/config.h> | ||
48 | #include <linux/platform_device.h> | 47 | #include <linux/platform_device.h> |
49 | #include <linux/module.h> | 48 | #include <linux/module.h> |
50 | #include <linux/tty.h> | 49 | #include <linux/tty.h> |
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index 1cd102f84bfa..8c498f785e21 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
@@ -50,7 +50,6 @@ | |||
50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. | 50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #include <linux/config.h> | ||
54 | 53 | ||
55 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 54 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
56 | #define SUPPORT_SYSRQ | 55 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 64c0e89124c9..4a1c9983f38f 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -16,7 +16,6 @@ | |||
16 | ** | 16 | ** |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/config.h> | ||
20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index e3ba7e17a240..4d9435451f4a 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #undef DEBUG_HARD | 42 | #undef DEBUG_HARD |
43 | #undef USE_CTRL_O_SYSRQ | 43 | #undef USE_CTRL_O_SYSRQ |
44 | 44 | ||
45 | #include <linux/config.h> | ||
46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
47 | #include <linux/tty.h> | 46 | #include <linux/tty.h> |
48 | 47 | ||
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 0fa0ccc9ed27..a720953a404e 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * with the serial core maintainer satisfaction to appear soon. | 24 | * with the serial core maintainer satisfaction to appear soon. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/config.h> | ||
28 | 27 | ||
29 | #if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 28 | #if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
30 | #define SUPPORT_SYSRQ | 29 | #define SUPPORT_SYSRQ |
@@ -390,7 +389,7 @@ static int serial_pxa_startup(struct uart_port *port) | |||
390 | 389 | ||
391 | /* | 390 | /* |
392 | * Finally, enable interrupts. Note: Modem status interrupts | 391 | * Finally, enable interrupts. Note: Modem status interrupts |
393 | * are set via set_termios(), which will be occuring imminently | 392 | * are set via set_termios(), which will be occurring imminently |
394 | * anyway, so we don't enable them here. | 393 | * anyway, so we don't enable them here. |
395 | */ | 394 | */ |
396 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; | 395 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 4c62ab949ecc..392bffcf96e8 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -55,7 +55,6 @@ | |||
55 | * BJD, 04-Nov-2004 | 55 | * BJD, 04-Nov-2004 |
56 | */ | 56 | */ |
57 | 57 | ||
58 | #include <linux/config.h> | ||
59 | 58 | ||
60 | #if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 59 | #if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
61 | #define SUPPORT_SYSRQ | 60 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 8bbd8567669c..db3486d33870 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $ | 24 | * $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $ |
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | #include <linux/config.h> | ||
28 | 27 | ||
29 | #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 28 | #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
30 | #define SUPPORT_SYSRQ | 29 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 7dc1e67b6851..c54af8774393 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c | |||
@@ -22,7 +22,6 @@ | |||
22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 | */ | 24 | */ |
25 | #include <linux/config.h> | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/tty.h> | 26 | #include <linux/tty.h> |
28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 776d4ff06084..23ddedbaec08 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | 30 | ||
32 | #if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 31 | #if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
33 | #define SUPPORT_SYSRQ | 32 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index a901a7e446f3..28c1881a6691 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -38,7 +38,6 @@ | |||
38 | * Fix some spin_locks. | 38 | * Fix some spin_locks. |
39 | * Do not call uart_add_one_port for absent ports. | 39 | * Do not call uart_add_one_port for absent ports. |
40 | */ | 40 | */ |
41 | #include <linux/config.h> | ||
42 | 41 | ||
43 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 42 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
44 | #define SUPPORT_SYSRQ | 43 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index d97f3ca6cc29..2509c3237e87 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | #undef DEBUG | 21 | #undef DEBUG |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 1f14bb4382f6..ab320fa3237c 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
@@ -10,7 +10,6 @@ | |||
10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). | 10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). |
11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). | 11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). |
12 | */ | 12 | */ |
13 | #include <linux/config.h> | ||
14 | #include <linux/serial_core.h> | 13 | #include <linux/serial_core.h> |
15 | 14 | ||
16 | #if defined(__H8300H__) || defined(__H8300S__) | 15 | #if defined(__H8300H__) || defined(__H8300S__) |
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 60ea4a3f0713..4b0afc8f12b9 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
@@ -37,7 +37,6 @@ | |||
37 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan | 37 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan |
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include <linux/config.h> | ||
41 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
42 | #include <linux/tty.h> | 41 | #include <linux/tty.h> |
43 | #include <linux/serial.h> | 42 | #include <linux/serial.h> |
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index fa4ae94243c2..e35d9ab359f1 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 10 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
16 | #include <linux/console.h> | 15 | #include <linux/console.h> |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 141fedbefbc4..20a48697727c 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
@@ -15,7 +15,6 @@ | |||
15 | * David S. Miller <davem@davemloft.net> | 15 | * David S. Miller <davem@davemloft.net> |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 73a043b914ef..72c86d0017f5 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -15,7 +15,6 @@ | |||
15 | * David S. Miller (davem@davemloft.net), 2002-Jul-29 | 15 | * David S. Miller (davem@davemloft.net), 2002-Jul-29 |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 1caa286a6be6..9ee7f3af9ae2 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * Copyright (C) 2002, 2006 David S. Miller (davem@davemloft.net) | 12 | * Copyright (C) 2002, 2006 David S. Miller (davem@davemloft.net) |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c index 017571ffa19c..e93d0edc2e08 100644 --- a/drivers/serial/vr41xx_siu.c +++ b/drivers/serial/vr41xx_siu.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | #include <linux/config.h> | ||
23 | 22 | ||
24 | #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 23 | #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
25 | #define SUPPORT_SYSRQ | 24 | #define SUPPORT_SYSRQ |