19 files changed, 19 insertions, 19 deletions

diff --git a/drivers/char/joystick/a3d.c b/drivers/char/joystick/a3d.c
index bd17f8de2..09642a9e7 100644
--- a/drivers/char/joystick/a3d.c
+++ b/drivers/char/joystick/a3d.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/adi.c b/drivers/char/joystick/adi.c
index a2f68d74e..5bdf269fc 100644
--- a/drivers/char/joystick/adi.c
+++ b/drivers/char/joystick/adi.c
@@ -34,7 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/amijoy.c b/drivers/char/joystick/amijoy.c
index 452d173d7..2d9ca4ffe 100644
--- a/drivers/char/joystick/amijoy.c
+++ b/drivers/char/joystick/amijoy.c
@@ -113,7 +113,7 @@ static int __init amijoy_init(void)
 	for (i = 0; i < 2; i++)
 		if (amijoy[i]) {
 			if (!request_mem_region(CUSTOM_PHYSADDR+10+i*2, 2,
-						amijoy [Denise]")) {
+						"amijoy [Denise]")) {
 				if (i == 1 && amijoy[0]) {
 					input_unregister_device(amijoy_dev);
 					release_mem_region(CUSTOM_PHYSADDR+10, 2);
diff --git a/drivers/char/joystick/analog.c b/drivers/char/joystick/analog.c
index dbd46fb7e..a9f5a0b0d 100644
--- a/drivers/char/joystick/analog.c
+++ b/drivers/char/joystick/analog.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/cobra.c b/drivers/char/joystick/cobra.c
index f059a2ff6..d71ac96ac 100644
--- a/drivers/char/joystick/cobra.c
+++ b/drivers/char/joystick/cobra.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/gameport.c b/drivers/char/joystick/gameport.c
index 15ef908a6..d3cb6422e 100644
--- a/drivers/char/joystick/gameport.c
+++ b/drivers/char/joystick/gameport.c
@@ -35,7 +35,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/isapnp.h>
 #include <linux/stddef.h>
 #include <linux/delay.h>
diff --git a/drivers/char/joystick/gf2k.c b/drivers/char/joystick/gf2k.c
index cad8be16b..5ec0e7f6d 100644
--- a/drivers/char/joystick/gf2k.c
+++ b/drivers/char/joystick/gf2k.c
@@ -32,7 +32,7 @@
 
 #include <linux/delay.h>
 #include <linux/kernel.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/char/joystick/grip.c b/drivers/char/joystick/grip.c
index 4cedd7892..3d9742b33 100644
--- a/drivers/char/joystick/grip.c
+++ b/drivers/char/joystick/grip.c
@@ -33,7 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
 
diff --git a/drivers/char/joystick/iforce.c b/drivers/char/joystick/iforce.c
index af8adaed1..124edb321 100644
--- a/drivers/char/joystick/iforce.c
+++ b/drivers/char/joystick/iforce.c
@@ -29,7 +29,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/interact.c b/drivers/char/joystick/interact.c
index 7104e5d49..267122804 100644
--- a/drivers/char/joystick/interact.c
+++ b/drivers/char/joystick/interact.c
@@ -34,7 +34,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/lightning.c b/drivers/char/joystick/lightning.c
index 69dfd1112..c05c90021 100644
--- a/drivers/char/joystick/lightning.c
+++ b/drivers/char/joystick/lightning.c
@@ -38,7 +38,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #define L4_PORT			0x201
 #define L4_SELECT_ANALOG	0xa4
diff --git a/drivers/char/joystick/magellan.c b/drivers/char/joystick/magellan.c
index e8c77f48e..2867a3a18 100644
--- a/drivers/char/joystick/magellan.c
+++ b/drivers/char/joystick/magellan.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/ns558.c b/drivers/char/joystick/ns558.c
index 36c5d9f9e..a4b26a083 100644
--- a/drivers/char/joystick/ns558.c
+++ b/drivers/char/joystick/ns558.c
@@ -38,7 +38,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/isapnp.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
diff --git a/drivers/char/joystick/serport.c b/drivers/char/joystick/serport.c
index 453e674d7..14c6537aa 100644
--- a/drivers/char/joystick/serport.c
+++ b/drivers/char/joystick/serport.c
@@ -33,7 +33,7 @@
 
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/serio.h>
diff --git a/drivers/char/joystick/sidewinder.c b/drivers/char/joystick/sidewinder.c
index ae31265cb..1ba412305 100644
--- a/drivers/char/joystick/sidewinder.c
+++ b/drivers/char/joystick/sidewinder.c
@@ -33,7 +33,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
diff --git a/drivers/char/joystick/spaceball.c b/drivers/char/joystick/spaceball.c
index 8e2936f73..e6aa5f094 100644
--- a/drivers/char/joystick/spaceball.c
+++ b/drivers/char/joystick/spaceball.c
@@ -35,7 +35,7 @@
  */
 
 #include <linux/kernel.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/char/joystick/spaceorb.c b/drivers/char/joystick/spaceorb.c
index 866e1ba50..4c595fdce 100644
--- a/drivers/char/joystick/spaceorb.c
+++ b/drivers/char/joystick/spaceorb.c
@@ -34,7 +34,7 @@
  */
 
 #include <linux/kernel.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/char/joystick/tmdc.c b/drivers/char/joystick/tmdc.c
index f356f7dd5..611ae962a 100644
--- a/drivers/char/joystick/tmdc.c
+++ b/drivers/char/joystick/tmdc.c
@@ -36,7 +36,7 @@
 
 #include <linux/delay.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
diff --git a/drivers/char/joystick/warrior.c b/drivers/char/joystick/warrior.c
index 7000b8560..d84f2950e 100644
--- a/drivers/char/joystick/warrior.c
+++ b/drivers/char/joystick/warrior.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/init.h>