From a50753e0170ecd928b97ee708aa0127102e543e6 Mon Sep 17 00:00:00 2001
From: Michael Holzheu <michael.holzheu@linux.vnet.ibm.com>
Date: Wed, 14 Oct 2009 12:43:51 +0200
Subject: [PATCH] --- yaml --- r: 167482 b: refs/heads/master c:
 ac522b638dcb549f9d33085c6fadea88a5f826ae h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/s390/char/sclp_vt220.c | 30 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 9fd74ab3c003..98f580135985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7c5afc890d0c9345ee05ccf0e6c692b6c8f8a8
+refs/heads/master: ac522b638dcb549f9d33085c6fadea88a5f826ae
diff --git a/trunk/drivers/s390/char/sclp_vt220.c b/trunk/drivers/s390/char/sclp_vt220.c
index 178724f2a4c3..b9d2a007e93b 100644
--- a/trunk/drivers/s390/char/sclp_vt220.c
+++ b/trunk/drivers/s390/char/sclp_vt220.c
@@ -705,21 +705,6 @@ static int __init sclp_vt220_tty_init(void)
 }
 __initcall(sclp_vt220_tty_init);
 
-#ifdef CONFIG_SCLP_VT220_CONSOLE
-
-static void
-sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count)
-{
-	__sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0);
-}
-
-static struct tty_driver *
-sclp_vt220_con_device(struct console *c, int *index)
-{
-	*index = 0;
-	return sclp_vt220_driver;
-}
-
 static void __sclp_vt220_flush_buffer(void)
 {
 	unsigned long flags;
@@ -776,6 +761,21 @@ static void sclp_vt220_pm_event_fn(struct sclp_register *reg,
 	}
 }
 
+#ifdef CONFIG_SCLP_VT220_CONSOLE
+
+static void
+sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count)
+{
+	__sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0);
+}
+
+static struct tty_driver *
+sclp_vt220_con_device(struct console *c, int *index)
+{
+	*index = 0;
+	return sclp_vt220_driver;
+}
+
 static int
 sclp_vt220_notify(struct notifier_block *self,
 			  unsigned long event, void *data)