From: Heiko Carstens We get this: Section mismatch: reference to .init.text:con3270_consetup from .data between 'con3270' (at offset 0x45c8) and 'con3270_fn' Section mismatch: reference to .init.text:con3215_consetup from .data between 'con3215' (at offset 0x4678) and 'raw3215_ccw_driver' Since there is no difference between a non present console setup function and one that returns only 0 remove them. Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens --- drivers/s390/char/con3215.c | 7 ------- drivers/s390/char/con3270.c | 7 ------- 2 files changed, 14 deletions(-) Index: quilt-2.6/drivers/s390/char/con3215.c =================================================================== --- quilt-2.6.orig/drivers/s390/char/con3215.c 2007-04-27 16:01:49.000000000 +0200 +++ quilt-2.6/drivers/s390/char/con3215.c 2007-04-27 16:04:58.000000000 +0200 @@ -813,12 +813,6 @@ spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags); } -static int __init -con3215_consetup(struct console *co, char *options) -{ - return 0; -} - /* * The console structure for the 3215 console */ @@ -827,7 +821,6 @@ .write = con3215_write, .device = con3215_device, .unblank = con3215_unblank, - .setup = con3215_consetup, .flags = CON_PRINTBUFFER, }; Index: quilt-2.6/drivers/s390/char/con3270.c =================================================================== --- quilt-2.6.orig/drivers/s390/char/con3270.c 2007-04-27 16:01:49.000000000 +0200 +++ quilt-2.6/drivers/s390/char/con3270.c 2007-04-27 16:04:58.000000000 +0200 @@ -555,12 +555,6 @@ 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 @@ .write = con3270_write, .device = con3270_device, .unblank = con3270_unblank, - .setup = con3270_consetup, .flags = CON_PRINTBUFFER, }; -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/