diff options
Diffstat (limited to 'drivers/video')
57 files changed, 57 insertions, 57 deletions
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c index e8c0c97daeb2..9115ce37d865 100644 --- a/drivers/video/S3triofb.c +++ b/drivers/video/S3triofb.c @@ -30,7 +30,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 5289a4a83fdf..bba3a3ce5d53 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c @@ -23,7 +23,7 @@ #include <linux/ctype.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/fb.h> diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 1f95e4dac383..fcdf286c8849 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -46,7 +46,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/config.h> #include <linux/interrupt.h> diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index e305027a7ac6..62a1461c2da2 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -54,7 +54,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> diff --git a/drivers/video/aty128fb.c b/drivers/video/aty128fb.c index 626bf3cad35f..93913b3b2dc6 100644 --- a/drivers/video/aty128fb.c +++ b/drivers/video/aty128fb.c @@ -33,7 +33,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/atyfb.c b/drivers/video/atyfb.c index 3c0b9408f816..833926b7ba7b 100644 --- a/drivers/video/atyfb.c +++ b/drivers/video/atyfb.c @@ -45,7 +45,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/bwtwofb.c b/drivers/video/bwtwofb.c index ebb5d5e56297..d0ea4e079b96 100644 --- a/drivers/video/bwtwofb.c +++ b/drivers/video/bwtwofb.c @@ -15,7 +15,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/cgfourteenfb.c b/drivers/video/cgfourteenfb.c index 05a578bfd659..223722731240 100644 --- a/drivers/video/cgfourteenfb.c +++ b/drivers/video/cgfourteenfb.c @@ -12,7 +12,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/cgsixfb.c b/drivers/video/cgsixfb.c index b569589d0a8c..6e78465156a4 100644 --- a/drivers/video/cgsixfb.c +++ b/drivers/video/cgsixfb.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/cgthreefb.c b/drivers/video/cgthreefb.c index 9cec20abfa4f..1deff1827229 100644 --- a/drivers/video/cgthreefb.c +++ b/drivers/video/cgthreefb.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index 9a3908c4b078..c0bee62d44a9 100644 --- a/drivers/video/chipsfb.c +++ b/drivers/video/chipsfb.c @@ -21,7 +21,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/clgenfb.c b/drivers/video/clgenfb.c index 32a26c2d738e..ecad3bbbed50 100644 --- a/drivers/video/clgenfb.c +++ b/drivers/video/clgenfb.c @@ -40,7 +40,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index fe64ab9a143c..58ccd3e139a4 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c @@ -31,7 +31,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/creatorfb.c b/drivers/video/creatorfb.c index 22349c3807ae..712843792cee 100644 --- a/drivers/video/creatorfb.c +++ b/drivers/video/creatorfb.c @@ -11,7 +11,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 5cb924fc85c2..d8c524e760d1 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c @@ -31,7 +31,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/pci.h> diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c index 4510d116550d..75f457092869 100644 --- a/drivers/video/cyberfb.c +++ b/drivers/video/cyberfb.c @@ -82,7 +82,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/zorro.h> #include <linux/fb.h> diff --git a/drivers/video/dn_cfb4.c b/drivers/video/dn_cfb4.c index 205703be4515..3f30e9d97264 100644 --- a/drivers/video/dn_cfb4.c +++ b/drivers/video/dn_cfb4.c @@ -3,7 +3,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <asm/setup.h> diff --git a/drivers/video/dn_cfb8.c b/drivers/video/dn_cfb8.c index a654717b3d2f..d200972a780f 100644 --- a/drivers/video/dn_cfb8.c +++ b/drivers/video/dn_cfb8.c @@ -3,7 +3,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <asm/setup.h> diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c index f7a5ffba3af0..7bc2f92b285c 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c @@ -3,7 +3,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <asm/setup.h> diff --git a/drivers/video/fbcon.c b/drivers/video/fbcon.c index 32935dfc3cf4..15230bb3b6fa 100644 --- a/drivers/video/fbcon.c +++ b/drivers/video/fbcon.c @@ -67,7 +67,7 @@ #include <linux/console.h> #include <linux/string.h> #include <linux/kd.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/fb.h> #include <linux/vt_kern.h> #include <linux/selection.h> diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 097bc3f12da2..7d5c70808c48 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -17,7 +17,7 @@ #include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mman.h> #include <linux/tty.h> #include <linux/console.h> diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c index 43829e53c585..15ed42857f61 100644 --- a/drivers/video/g364fb.c +++ b/drivers/video/g364fb.c @@ -21,7 +21,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c index 87ab4a270f05..5bcdf0d8aeb1 100644 --- a/drivers/video/hgafb.c +++ b/drivers/video/hgafb.c @@ -37,7 +37,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index 91b2b77ebd58..747430ebfc1a 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c @@ -17,7 +17,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/nubus.h> #include <linux/init.h> diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index df23d1aff883..a39dbaa8566b 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c index ac176a8cf8c4..aa08b6d8afdc 100644 --- a/drivers/video/igafb.c +++ b/drivers/video/igafb.c @@ -34,7 +34,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index 1749f3246dd7..f004fb3adf0a 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c @@ -22,7 +22,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/leofb.c b/drivers/video/leofb.c index 6b233e5f81e2..c24058a8d1ec 100644 --- a/drivers/video/leofb.c +++ b/drivers/video/leofb.c @@ -12,7 +12,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index 78538935a9b9..d471d7a46799 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c @@ -25,7 +25,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/nubus.h> #include <linux/init.h> diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index 68344dda2fdf..20c627905c31 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h @@ -32,7 +32,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/console.h> diff --git a/drivers/video/mdacon.c b/drivers/video/mdacon.c index 98e58b46c628..bbb046178c1c 100644 --- a/drivers/video/mdacon.c +++ b/drivers/video/mdacon.c @@ -33,7 +33,7 @@ #include <linux/console_struct.h> #include <linux/string.h> #include <linux/kd.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vt_kern.h> #include <linux/vt_buffer.h> #include <linux/selection.h> diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 1a1b7a3db369..b0397b1f82f7 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c @@ -19,7 +19,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/p9100fb.c b/drivers/video/p9100fb.c index f8687d7a7c76..59d8791c96b9 100644 --- a/drivers/video/p9100fb.c +++ b/drivers/video/p9100fb.c @@ -11,7 +11,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c index 20ab5c4e59e8..34ef08881c37 100644 --- a/drivers/video/platinumfb.c +++ b/drivers/video/platinumfb.c @@ -24,7 +24,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index a3ee01ea130f..8eee8643c12a 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -20,7 +20,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/promcon.c b/drivers/video/promcon.c index 9c7277b702a1..cc2cac9f1de9 100644 --- a/drivers/video/promcon.c +++ b/drivers/video/promcon.c @@ -12,7 +12,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/console.h> #include <linux/console_struct.h> diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c index a5c68f070733..e76d6e97976e 100644 --- a/drivers/video/q40fb.c +++ b/drivers/video/q40fb.c @@ -3,7 +3,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c index 9f1be5adc7ba..73d3d489565e 100644 --- a/drivers/video/retz3fb.c +++ b/drivers/video/retz3fb.c @@ -26,7 +26,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/zorro.h> diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index b2f899a40026..fc3d7c17a03d 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -36,7 +36,7 @@ #include <linux/mm.h> #include <linux/selection.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 2f4e2c1403f4..7fc1e0c71956 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -65,7 +65,7 @@ #include <linux/ctype.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/fb.h> #include <linux/delay.h> diff --git a/drivers/video/sbusfb.c b/drivers/video/sbusfb.c index 4d5b66386d13..e68950bf401b 100644 --- a/drivers/video/sbusfb.c +++ b/drivers/video/sbusfb.c @@ -28,7 +28,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index e1751e84e088..bf8d17e5409e 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c @@ -16,7 +16,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 592180c18810..e53a45e5c9eb 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -18,7 +18,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/console.h> diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c index f6cd0a21e513..bac350b74a19 100644 --- a/drivers/video/skeletonfb.c +++ b/drivers/video/skeletonfb.c @@ -14,7 +14,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/sticon-bmode.c b/drivers/video/sticon-bmode.c index e401cbfcd9f1..67ad6167159a 100644 --- a/drivers/video/sticon-bmode.c +++ b/drivers/video/sticon-bmode.c @@ -67,7 +67,7 @@ this file *will* be replaced with it. You have been warned. #include <linux/console.h> #include <linux/string.h> #include <linux/kd.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vt_kern.h> #include <linux/selection.h> #include <linux/ioport.h> diff --git a/drivers/video/sticore.c b/drivers/video/sticore.c index 56e7f43ce5f9..11f40694f01f 100644 --- a/drivers/video/sticore.c +++ b/drivers/video/sticore.c @@ -1,7 +1,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 661ff29c510c..27a28f10c9b9 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c @@ -28,7 +28,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/init.h> diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c index 87936fc0a814..04e6c5167edf 100644 --- a/drivers/video/sun3fb.c +++ b/drivers/video/sun3fb.c @@ -32,7 +32,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/tcxfb.c b/drivers/video/tcxfb.c index dc23dd40571c..3633fc2e3ce1 100644 --- a/drivers/video/tcxfb.c +++ b/drivers/video/tcxfb.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index d954dc02e85c..812c3f9c872f 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c @@ -61,7 +61,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c index 880f1d1db48d..9e41f7f3851e 100644 --- a/drivers/video/tgafb.c +++ b/drivers/video/tgafb.c @@ -34,7 +34,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 24a8b04a11bc..7f7bd3a1b998 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c @@ -44,7 +44,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 11e803273193..01862992dc3e 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -14,7 +14,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/console.h> diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index b494e25c6919..a2d101945c32 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c @@ -14,7 +14,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/delay.h> #include <linux/interrupt.h> diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c index 35197da609f8..a1fa94d371e2 100644 --- a/drivers/video/vga16fb.c +++ b/drivers/video/vga16fb.c @@ -15,7 +15,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> #include <linux/console.h> diff --git a/drivers/video/vgacon.c b/drivers/video/vgacon.c index 6268b1766644..0f341e2223f2 100644 --- a/drivers/video/vgacon.c +++ b/drivers/video/vgacon.c @@ -43,7 +43,7 @@ #include <linux/console_struct.h> #include <linux/string.h> #include <linux/kd.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vt_kern.h> #include <linux/selection.h> #include <linux/spinlock.h> diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c index 047482699a66..9fbafbaf468a 100644 --- a/drivers/video/virgefb.c +++ b/drivers/video/virgefb.c @@ -22,7 +22,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/zorro.h> #include <linux/fb.h> |