Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / con3270.c

diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 8e7f2d7633d6f48fe71f5cbf2d43132a4f5f6818..fd3479119eb4e1bc568a4f5d5b5e428bc6a5d8d8 100644 (file)
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -555,12 +555,6 @@ con3270_unblank(void)
        spin_unlock_irqrestore(&cp->view.lock, flags);
 }
 
-static int __init 
-con3270_consetup(struct console *co, char *options)
-{
-       return 0;
-}
-
 /*
  *  The console structure for the 3270 console
  */
@@ -569,7 +563,6 @@ static struct console con3270 = {
        .write   = con3270_write,
        .device  = con3270_device,
        .unblank = con3270_unblank,
-       .setup   = con3270_consetup,
        .flags   = CON_PRINTBUFFER,
 };