Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / s390 / char / keyboard.c

diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index d4d2ff0..3be0656 100644 (file)
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -7,7 +7,6 @@
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/sysrq.h>
@@ -104,7 +103,7 @@ out_maps:
 out_kbd:
        kfree(kbd);
 out:
-       return 0;
+       return NULL;
 }
 
 void
@@ -305,7 +304,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
                if (kbd->sysrq) {
                        if (kbd->sysrq == K(KT_LATIN, '-')) {
                                kbd->sysrq = 0;
-                               handle_sysrq(value, 0, kbd->tty);
+                               handle_sysrq(value, NULL, kbd->tty);
                                return;
                        }
                        if (value == '-') {
@@ -364,7 +363,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, struct kbentry __user *user_kbe,
                        /* disallocate map */
                        key_map = kbd->key_maps[tmp.kb_table];
                        if (key_map) {
-                           kbd->key_maps[tmp.kb_table] = 0;
+                           kbd->key_maps[tmp.kb_table] = NULL;
                            kfree(key_map);
                        }
                        break;