diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
| commit | c8ebfc888f9ee93f2dc7cd62b3be66263755d99a (patch) | |
| tree | f449a3433c022ed8fd9aaa8f291a1b4e354fd5b9 /drivers/input | |
| parent | 5d12a58c4049a4839abbbdf87dd189505513b1b6 (diff) | |
v2.4.1.2 -> v2.4.1.3
- Jens: better ordering of requests when unable to merge
- Neil Brown: make md work as a module again (we cannot autodetect
in modules, not enough background information)
- Neil Brown: raid5 SMP locking cleanups
- Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
dentry leak fix
- maestro3 shutdown fix
- fix dcache hash calculation that could cause bad hashes under certain
circumstances (Dean Gaudet)
- David Miller: networking and sparc updates
- Jeff Garzik: include file cleanups
- Andy Grover: ACPI update
- Coda-fs error return fixes
- rth: alpha Jensen update
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 8e676b8da378..d1df86bc9d08 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 4e12f55b7234..d3323f733c6f 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 95fce5e80f5f..2ab0e58dd100 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 e6a9e02a131a..44344f8df70e 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> |