Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[linux-2.6] / drivers / tc / zs.c

diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index fc3197273663e93c48f975cded7c748727ad0370..4fff61b32dcbdbf6bc25d1ba0808d0e58f249217 100644 (file)
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -70,7 +70,6 @@
 #include <asm/dec/machtype.h>
 #include <asm/dec/serial.h>
 #include <asm/dec/system.h>
-#include <asm/dec/tc.h>
 
 #ifdef CONFIG_KGDB
 #include <asm/kgdb.h>
@@ -144,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 */
@@ -626,10 +625,8 @@ static void do_softint(unsigned long private_)
        if (!tty)
                return;
 
-       if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+       if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
                tty_wakeup(tty);
-               wake_up_interruptible(&tty->write_wait);
-       }
 }
 
 static int zs_startup(struct dec_serial * info)
@@ -1584,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;
@@ -1926,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;
@@ -2185,7 +2182,7 @@ struct dec_serial_hook zs_kgdbhook = {
        .init_info      = kgdbhook_init_info,
        .rx_char        = kgdbhook_rx_char,
        .cflags         = B38400 | CS8 | CLOCAL,
-}
+};
 
 void __init zs_kgdb_hook(int tty_num)
 {