diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/input | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/evdev.c | 2 | ||||
| -rw-r--r-- | drivers/input/joydev.c | 2 | ||||
| -rw-r--r-- | drivers/input/keybdev.c | 3 | ||||
| -rw-r--r-- | drivers/input/mousedev.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 8e676b8da..d1df86bc9 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -33,7 +33,7 @@ #define EVDEV_BUFFER_SIZE 64 #include <linux/poll.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/module.h> #include <linux/init.h> #include <linux/input.h> diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 4e12f55b7..d3323f733 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -38,7 +38,7 @@ #include <linux/input.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/miscdevice.h> #include <linux/module.h> diff --git a/drivers/input/keybdev.c b/drivers/input/keybdev.c index 95fce5e80..2ab0e58dd 100644 --- a/drivers/input/keybdev.c +++ b/drivers/input/keybdev.c @@ -31,8 +31,9 @@ #include <linux/config.h> #include <linux/kbd_ll.h> #include <linux/input.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> +#include <linux/tty.h> #include <linux/module.h> #include <linux/kbd_kern.h> diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index e6a9e02a1..44344f8df 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -32,7 +32,7 @@ #define MOUSEDEV_MINORS 32 #define MOUSEDEV_MIX 31 -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/module.h> #include <linux/init.h> |