Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 723bf4191bfe..544f137d70d7 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -207,7 +207,7 @@ __sclp_vt220_emit(struct sclp_vt220_request *request)
                 request->sclp_req.status = SCLP_REQ_FAILED;
                 return -EIO;
         }
-        request->sclp_req.command = SCLP_CMDW_WRITEDATA;
+        request->sclp_req.command = SCLP_CMDW_WRITE_EVENT_DATA;
         request->sclp_req.status = SCLP_REQ_FILLED;
         request->sclp_req.callback = sclp_vt220_callback;
         request->sclp_req.callback_data = (void *) request;
@@ -669,7 +669,7 @@ static const struct tty_operations sclp_vt220_ops = {
 /*
  * Register driver with SCLP and Linux and initialize internal tty structures.
  */
-int __init
+static int __init
 sclp_vt220_tty_init(void)
 {
         struct tty_driver *driver;