Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

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

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 90536f60bf502f0410c13607d0b0555c494ae374..e3b3d390b4a3b2294f23428c6e5b70b688298f23 100644 (file)
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -13,7 +13,6 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
-#include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/err.h>
@@ -649,7 +648,7 @@ sclp_eval_textcmd(struct gds_subvector *start,
        subvec = start;
        while (subvec < end) {
                subvec = find_gds_subvector(subvec, end,
-                                           GDS_KEY_SelfDefTextMsg);
+                                           GDS_KEY_SELFDEFTEXTMSG);
                if (!subvec)
                        break;
                sclp_eval_selfdeftextmsg((struct gds_subvector *)(subvec + 1),
@@ -665,7 +664,7 @@ sclp_eval_cpmsu(struct gds_vector *start, struct gds_vector *end)
 
        vec = start;
        while (vec < end) {
-               vec = find_gds_vector(vec, end, GDS_ID_TextCmd);
+               vec = find_gds_vector(vec, end, GDS_ID_TEXTCMD);
                if (!vec)
                        break;
                sclp_eval_textcmd((struct gds_subvector *)(vec + 1),
@@ -704,7 +703,7 @@ sclp_tty_state_change(struct sclp_register *reg)
 
 static struct sclp_register sclp_input_event =
 {
-       .receive_mask = EvTyp_OpCmd_Mask | EvTyp_PMsgCmd_Mask,
+       .receive_mask = EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK,
        .state_change_fn = sclp_tty_state_change,
        .receiver_fn = sclp_tty_receiver
 };