From: David Schleef <ds@schleef.org>
Date: Sat, 1 Dec 2001 01:07:37 +0000 (+0000)
Subject: Change linux/malloc.h to linux/slab.h
X-Git-Tag: r0_7_62~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71a0bac739728fd5fe31e5ec8aa0b8eda187c74e;p=comedi.git

Change linux/malloc.h to linux/slab.h
---

diff --git a/comedi/drivers/8255.c b/comedi/drivers/8255.c
index c5f660e3..0a803b87 100644
--- a/comedi/drivers/8255.c
+++ b/comedi/drivers/8255.c
@@ -55,7 +55,7 @@ chips.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index e5e7dce5..3622c06a 100644
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -54,7 +54,7 @@ multiplexer.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index d3a8e893..4c21cb7c 100644
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -45,7 +45,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 051413e3..a57f9aa4 100644
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -33,7 +33,7 @@ Devices: [Amplicon] PCI230 (amplc_pci230), PCI260
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index e0a596d7..4fd1bec8 100644
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -84,7 +84,7 @@ analog triggering on 1602 series
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index 2bca6c2f..6fa83046 100644
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -76,7 +76,7 @@ TODO:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c
index 26c43a23..cb76f3c1 100644
--- a/comedi/drivers/cb_pcidda.c
+++ b/comedi/drivers/cb_pcidda.c
@@ -50,7 +50,7 @@ PLEASE REPORT IF YOU ARE USING IT WITH A DIFFERENT CARD
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c
index b953d52c..b43732bd 100644
--- a/comedi/drivers/comedi_parport.c
+++ b/comedi/drivers/comedi_parport.c
@@ -88,7 +88,7 @@ pin, which can be used to wake up tasks.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c
index e8cd2828..ac9a4f41 100644
--- a/comedi/drivers/daqboard2000.c
+++ b/comedi/drivers/daqboard2000.c
@@ -119,7 +119,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index dcb3fb8d..d8e59476 100644
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -58,7 +58,7 @@ driver.
 #include <linux/comedidev.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/init.h>
diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c
index 571c996c..86482f7e 100644
--- a/comedi/drivers/das16.c
+++ b/comedi/drivers/das16.c
@@ -95,7 +95,7 @@ Computer boards manuals also available from their website www.measurementcomputi
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <asm/dma.h>
 #include "8253.h"
diff --git a/comedi/drivers/das16m1.c b/comedi/drivers/das16m1.c
index 103dbd89..05a7b96b 100644
--- a/comedi/drivers/das16m1.c
+++ b/comedi/drivers/das16m1.c
@@ -64,7 +64,7 @@ irq can be omitted, although the cmd interface will not work without it.
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include "8255.h"
 #include "8253.h"
diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index a19f897e..de37cf45 100644
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -103,7 +103,7 @@ TODO:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index d8549b17..13a487c7 100644
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -79,7 +79,7 @@ NOTES:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/dt2811.c b/comedi/drivers/dt2811.c
index e5b9138f..f572a4aa 100644
--- a/comedi/drivers/dt2811.c
+++ b/comedi/drivers/dt2811.c
@@ -49,7 +49,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
diff --git a/comedi/drivers/dt2814.c b/comedi/drivers/dt2814.c
index 26e92912..341bfbbf 100644
--- a/comedi/drivers/dt2814.c
+++ b/comedi/drivers/dt2814.c
@@ -44,7 +44,7 @@ addition, the clock does not seem to be very accurate.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/dt2815.c b/comedi/drivers/dt2815.c
index c7b8c7af..dd173270 100644
--- a/comedi/drivers/dt2815.c
+++ b/comedi/drivers/dt2815.c
@@ -60,7 +60,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/dt2817.c b/comedi/drivers/dt2817.c
index 325167a0..bd3690ac 100644
--- a/comedi/drivers/dt2817.c
+++ b/comedi/drivers/dt2817.c
@@ -42,7 +42,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/dt282x.c b/comedi/drivers/dt282x.c
index ab3d5d0e..a5342cce 100644
--- a/comedi/drivers/dt282x.c
+++ b/comedi/drivers/dt282x.c
@@ -58,7 +58,7 @@ Notes:
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/fl512.c b/comedi/drivers/fl512.c
index 2a04c355..3cacb811 100644
--- a/comedi/drivers/fl512.c
+++ b/comedi/drivers/fl512.c
@@ -19,7 +19,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c
index eb384f06..7c8ddb81 100644
--- a/comedi/drivers/mite.c
+++ b/comedi/drivers/mite.c
@@ -58,7 +58,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #include "mite.h"
 #include "../kvmem.h"
diff --git a/comedi/drivers/mpc8260cpm.c b/comedi/drivers/mpc8260cpm.c
index 1e9c92ea..68dd457f 100644
--- a/comedi/drivers/mpc8260cpm.c
+++ b/comedi/drivers/mpc8260cpm.c
@@ -34,7 +34,7 @@ you to access the processor's generic digital I/O lines.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/multiq3.c b/comedi/drivers/multiq3.c
index 48dff42b..c1316436 100644
--- a/comedi/drivers/multiq3.c
+++ b/comedi/drivers/multiq3.c
@@ -33,7 +33,7 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3)
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/ni_670x.c b/comedi/drivers/ni_670x.c
index ab8be28b..124f5de8 100644
--- a/comedi/drivers/ni_670x.c
+++ b/comedi/drivers/ni_670x.c
@@ -39,7 +39,7 @@ ID is not known.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h> 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index 1d214570..9a28a2ad 100644
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -67,7 +67,7 @@ TRIG_WAKE_EOS
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c
index 69c001b2..fdc9ad99 100644
--- a/comedi/drivers/ni_atmio.c
+++ b/comedi/drivers/ni_atmio.c
@@ -42,6 +42,9 @@ Comedilib includes a utility to autocalibrate these boards.  The
 boards seem to boot into a state where the all calibration DACs
 are at one extreme of their range, thus the default calibration
 is terrible.  Calibration at boot is strongly encouraged.
+
+External triggering is supported for some events.  The channel index
+(scan_begin_arg, etc.) maps to PFI0 - PFI9.
 */
 /*
 	The real guts of the driver is in ni_mio_common.c, which is included
@@ -85,7 +88,7 @@ is terrible.  Calibration at boot is strongly encouraged.
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/comedidev.h>
 #ifdef HAVE_ISAPNP
 #include <linux/isapnp.h>
diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c
index c87c6d48..0b748829 100644
--- a/comedi/drivers/ni_atmio16d.c
+++ b/comedi/drivers/ni_atmio16d.c
@@ -39,7 +39,7 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 3a31b4de..61ac7956 100644
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -71,7 +71,7 @@ NI manuals:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index 6c8c6e27..d674cc2a 100644
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -48,7 +48,7 @@ See the notes in the ni_atmio.o driver.
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #ifdef CONFIG_COMEDI_RTL
 #include <linux/rtl.h>
 #endif
diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index 603d970c..df95630e 100644
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -63,7 +63,7 @@ AT-MIO96.
 #include <linux/comedidev.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/init.h>
diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index c4a7b0c5..cd5f16e9 100644
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -94,7 +94,7 @@ DMA is halfway completed, but not yet operational.
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/comedidev.h>
 #include <linux/init.h>
 
diff --git a/comedi/drivers/pcl711.c b/comedi/drivers/pcl711.c
index 7047e8f3..fb110bfc 100644
--- a/comedi/drivers/pcl711.c
+++ b/comedi/drivers/pcl711.c
@@ -62,7 +62,7 @@ supported.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcl724.c b/comedi/drivers/pcl724.c
index ecfeffaa..07d71b58 100644
--- a/comedi/drivers/pcl724.c
+++ b/comedi/drivers/pcl724.c
@@ -43,7 +43,7 @@ See the source for configuration details.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcl725.c b/comedi/drivers/pcl725.c
index 909a3b7b..7d438ddf 100644
--- a/comedi/drivers/pcl725.c
+++ b/comedi/drivers/pcl725.c
@@ -14,7 +14,7 @@ Devices: [Advantech] PCL-725 (pcl725)
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcl726.c b/comedi/drivers/pcl726.c
index 5fb0a054..9eeb9de9 100644
--- a/comedi/drivers/pcl726.c
+++ b/comedi/drivers/pcl726.c
@@ -72,7 +72,7 @@ Interrupts are not supported.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c
index 0191211c..e511686a 100644
--- a/comedi/drivers/pcl812.c
+++ b/comedi/drivers/pcl812.c
@@ -114,7 +114,7 @@ See the head of the source file pcl812.c for configuration options.
 #include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcm3730.c b/comedi/drivers/pcm3730.c
index 407abbb0..2e509e12 100644
--- a/comedi/drivers/pcm3730.c
+++ b/comedi/drivers/pcm3730.c
@@ -17,7 +17,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/pcmad.c b/comedi/drivers/pcmad.c
index aa6b37b3..4c7d22f4 100644
--- a/comedi/drivers/pcmad.c
+++ b/comedi/drivers/pcmad.c
@@ -47,7 +47,7 @@ Configuration options:
 #include <linux/comedidev.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/poc.c b/comedi/drivers/poc.c
index 6de34f4f..73b07610 100644
--- a/comedi/drivers/poc.c
+++ b/comedi/drivers/poc.c
@@ -41,7 +41,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index 7f573dd4..619c5731 100644
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -43,7 +43,7 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <asm/io.h>
diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c
index 11bc6c3b..b5b18d0c 100644
--- a/comedi/drivers/rtd520.c
+++ b/comedi/drivers/rtd520.c
@@ -87,7 +87,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/rti800.c b/comedi/drivers/rti800.c
index 38f681d7..e3af55bf 100644
--- a/comedi/drivers/rti800.c
+++ b/comedi/drivers/rti800.c
@@ -55,7 +55,7 @@ Configuration options:
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/rti802.c b/comedi/drivers/rti802.c
index cd8599cc..51971073 100644
--- a/comedi/drivers/rti802.c
+++ b/comedi/drivers/rti802.c
@@ -32,7 +32,7 @@ Status: works
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/skel.c b/comedi/drivers/skel.c
index 2751470a..7b90e0e3 100644
--- a/comedi/drivers/skel.c
+++ b/comedi/drivers/skel.c
@@ -34,7 +34,7 @@ written.
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/comedi/drivers/ssv_dnp.c b/comedi/drivers/ssv_dnp.c
index 47b93f46..63ccaa7f 100644
--- a/comedi/drivers/ssv_dnp.c
+++ b/comedi/drivers/ssv_dnp.c
@@ -34,7 +34,7 @@ Devices: [SSV Embedded Systems] DIL/Net-PC 1486 (dnp-1486)
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>