summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 11:16:35 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 11:16:35 +1000
commit7aea8dd9de5d0b7aecbfbb5a5991f941d71a3b42 (patch)
tree84d14e65efdb4f165d248fd3bd3e91b57edc90a1 /drivers
parentb9492f034a6c0c9b1e2d888559378f7aad0c4efd (diff)
parenta9b0bd7a278733c56660902edb7f81a4fa30407a (diff)
Merge remote branch 'm68knommu/for-next'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/68328serial.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 30463862603b..9330edb323e2 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -78,10 +78,6 @@ struct m68k_serial *m68k_consinfo = 0;
#define M68K_CLOCK (16667000) /* FIXME: 16MHz is likely wrong */
-#ifdef CONFIG_CONSOLE
-extern wait_queue_head_t keypress_wait;
-#endif
-
struct tty_driver *serial_driver;
/* number of characters left in xmit buffer before we ask for more */
@@ -300,10 +296,6 @@ static void receive_chars(struct m68k_serial *info, unsigned short rx)
return;
#endif /* CONFIG_MAGIC_SYSRQ */
}
- /* It is a 'keyboard interrupt' ;-) */
-#ifdef CONFIG_CONSOLE
- wake_up(&keypress_wait);
-#endif
}
if(!tty)