Subject: Re: [BUILD_FAILURE] next-20091013 s390x - build breaks SCLP VT220 terminal driver

From: Martin Schwidefsky <[email-masked]>
Date: Wed, 14 Oct 2009 11:02:46 +0200

On Tue, 13 Oct 2009 21:58:09 +0530
Kamalesh Babulal <[email-masked]> wrote:

> 	next-20091013 randconfig build on s390x build breaks with
> 
> drivers/s390/built-in.o:(.data+0x3354): undefined reference to `sclp_vt220_pm_event_fn'

This patch should take care of it:

--
Subject: [PATCH] sclp_vt220 build fix

From: Martin Schwidefsky <[email-masked]>

Fix this build error:

	next-20091013 randconfig build on s390x build breaks with

drivers/s390/built-in.o:(.data+0x3354): undefined reference to `sclp_vt220_pm_event_fn'

Reported-by: Kamalesh Babulal <[email-masked]>
Signed-off-by: Martin Schwidefsky <[email-masked]>
---

 drivers/s390/char/sclp_vt220.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -urpN linux-2.6/drivers/s390/char/sclp_vt220.c linux-2.6-patched/drivers/s390/char/sclp_vt220.c
--- linux-2.6/drivers/s390/char/sclp_vt220.c	2009-09-10 00:13:59.000000000 +0200
+++ linux-2.6-patched/drivers/s390/char/sclp_vt220.c	2009-10-14 11:00:22.000000000 +0200
@@ -93,8 +93,10 @@ static int __initdata sclp_vt220_init_co
 static int sclp_vt220_flush_later;
 
 static void sclp_vt220_receiver_fn(struct evbuf_header *evbuf);
+#ifdef CONFIG_SCLP_VT220_CONSOLE
 static void sclp_vt220_pm_event_fn(struct sclp_register *reg,
 				   enum sclp_pm_event sclp_pm_event);
+#endif
 static int __sclp_vt220_emit(struct sclp_vt220_request *request);
 static void sclp_vt220_emit_current(void);
 
@@ -104,7 +106,9 @@ static struct sclp_register sclp_vt220_r
 	.receive_mask		= EVTYP_VT220MSG_MASK,
 	.state_change_fn	= NULL,
 	.receiver_fn		= sclp_vt220_receiver_fn,
+#ifdef CONFIG_SCLP_VT220_CONSOLE
 	.pm_event_fn		= sclp_vt220_pm_event_fn,
+#endif
 };

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.