diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 14:55:48 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 14:55:48 +0100 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/tc | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/tc')
| -rw-r--r-- | drivers/tc/zs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 61de78a9f6e..4fff61b32dc 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c @@ -143,7 +143,7 @@ static struct console sercons; static unsigned long break_pressed; /* break, really ... */ #endif -static unsigned char zs_init_regs[16] __initdata = { +static unsigned char zs_init_regs[16] = { 0, /* write 0 */ 0, /* write 1 */ 0, /* write 2 */ @@ -1581,7 +1581,7 @@ static void __init show_serial_version(void) /* Initialize Z8530s zs_channels */ -static void __init probe_sccs(void) +static void probe_sccs(void) { struct dec_serial **pp; int i, n, n_chips = 0, n_channels, chip, channel; @@ -1923,7 +1923,7 @@ static struct tty_driver *serial_console_device(struct console *c, int *index) * - initialize the serial port * Return non-zero if we didn't find a serial port. */ -static int __init serial_console_setup(struct console *co, char *options) +static int serial_console_setup(struct console *co, char *options) { struct dec_serial *info; int baud = 9600; |