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

diff --git a/comedi/drivers/8255.c b/comedi/drivers/8255.c
index c5f660e313100b69304a81151aab4d628303dda8..0a803b8783b915fd5754a95b586750c442d53571 100644 (file)
--- 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 e5e7dce5f102c7f1f78f6358103d70539613ec90..3622c06a69453b38ca798367fd4985fb3200ac01 100644 (file)
--- 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 d3a8e89338f8f20be0a84e8e0b035f41491c0f13..4c21cb7cf226634cfda2bdcee878e356e268dce5 100644 (file)
--- 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 051413e3ebf8b53099c8519c0ef8fda567e259a8..a57f9aa48154c509d6070cccc7eb7eb5d3087cb5 100644 (file)
--- 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 e0a596d72570ab731c1c96c1adccb9bc100c9db5..4fd1bec8f989ef84e2e293580c7b8b5d468d94d7 100644 (file)
--- 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 2bca6c2f119c4a31c9027d9d9a37fcd6b70b1084..6fa8304634676932262761dc8938b502cfc0ddbe 100644 (file)
--- 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 26c43a231e6166aa611ec06437a7379f6f964cdc..cb76f3c118c7b8d8bd9f6286e99b1e90339632e1 100644 (file)
--- 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 b953d52ca97107af8c050ca9343e1f727a93d6cc..b43732bd5c962689059c543d06d586eeff548e5e 100644 (file)
--- 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 e8cd2828ec76ddf979ca70b048b08b8f461ed034..ac9a4f4114010f9a2d1b6c37702c8e61e38d09e5 100644 (file)
--- 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 dcb3fb8d9147740be8db941385c9dec020dbd240..d8e5947621bbe6a9e797a612277fc677a25683ae 100644 (file)
--- 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 571c996c9cbd655479319f0c27528ed4630e100b..86482f7e94bf6831a189829e3ea06665784d2213 100644 (file)
--- 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 103dbd895cfe810922b2fd7910772f41d7c52315..05a7b96b961e4f4f5328b44c58d45230f36051ad 100644 (file)
--- 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 a19f897edbe657bd919050c39c73d6fa7e1bf9e3..de37cf456a23799f5aef3893aa7047db34990d45 100644 (file)
--- 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 d8549b17296a388eda6d1981d302967758f1638b..13a487c7aa836b4471715b6807a090c0472e5616 100644 (file)
--- 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 e5b9138f7fec5e716a76057826189402036055d6..f572a4aa973ec697fd2724a843bef018f59940e7 100644 (file)
--- 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 26e92912a15bb79230bc15824f808decdf65c748..341bfbbff584ece36264879c8cd957a296f2a2b2 100644 (file)
--- 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 c7b8c7af9ca855185c8b4f63b7a0999bff895d28..dd173270fb028fe845d2c782ab5ebcb077232c3b 100644 (file)
--- 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 325167a07ace61bdc3d97df9364bf6835fb2f4ca..bd3690ac352621f0b133db7a263f0fc8cea74234 100644 (file)
--- 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 ab3d5d0e7d9b029355f629624574a15f75c51497..a5342ccefdb97a0d458ccd12d9f4b7e8436ef459 100644 (file)
--- 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 2a04c3558e05a3aec76af922d012c406b7a9b69b..3cacb81166d683b258464621f81788e60c53a3f9 100644 (file)
--- 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 eb384f06747e28b9cd220fffa5825465cb95ed04..7c8ddb81a31bef72ce9e3d4123ef595fd2f0dbac 100644 (file)
--- 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 1e9c92ea87cda5c177de378418000b4e4bd438df..68dd457fc465182536b6e7141fc38bd2d454c890 100644 (file)
--- 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 48dff42b56195da1c00e3b33abda926259e9d82b..c1316436558d5f0f874b0bed54dfed6874602b57 100644 (file)
--- 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 ab8be28b5423f75ffe239f827e8e88f2c012ae3a..124f5de85ceb9f2ee8b84c914ef8ed87c7a912b9 100644 (file)
--- 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 1d214570a6b030b2c810fd63df638f6e1ef2314b..9a28a2ad4299a927a9657ca0a51efc3ece30326e 100644 (file)
--- 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 69c001b2cd5608bdb35e0e9b4bf74ecd7b781731..fdc9ad99cb7da4a117635f43c208d3893bebee7c 100644 (file)
--- 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 c87c6d4878ef6133ff530c723b132c55fc46a44b..0b748829f1c9d2ed6f8e01ff1d4e1d7f130b10a7 100644 (file)
--- 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 3a31b4deddef57815d21c868a14eab2aa405d537..61ac7956f91a9974a0463035c9281a03961ec2d3 100644 (file)
--- 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 6c8c6e27aa9b1c6827f5bd4517e15d6ff602672b..d674cc2a085c511e961859f0c82261072ea5b547 100644 (file)
--- 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 603d970cd43b419ca77f1c2562ea4592742f19fb..df95630e9f9bde8c7e9ee3a667fd7c8913829fad 100644 (file)
--- 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 c4a7b0c5f4425ced98b1664e50221e18c36449cb..cd5f16e91f1777e242d4c9ae25a068825a195778 100644 (file)
--- 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 7047e8f37d47aaa52cf9daf3680ebf60ec1072cd..fb110bfce8e759c70d68fdfd0390fdc06cfb633c 100644 (file)
--- 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 ecfeffaaf14bc5defc89e94a454dd5016ff53ec8..07d71b588a91742204e33ef8ef049b0671e6175e 100644 (file)
--- 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 909a3b7bd94a41ad380030a408725b12a7b4e2c6..7d438ddfb91b615ae6b1f518169f4e763a7c7cd0 100644 (file)
--- 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 5fb0a054cba875949c04fa8bf117b6d12400cd46..9eeb9de951bdb80a76ef395b52e97c588b82a6f2 100644 (file)
--- 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 0191211c65985b9134cfc9b1e58fa3aa21f4e3af..e511686adc93649116c2d3a49cae78d1027a0187 100644 (file)
--- 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 407abbb0db293a0fe4d93955d789d1524b620b58..2e509e12d64a6d4d640f1a0a7f43f561d6e52653 100644 (file)
--- 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 aa6b37b3d76a6b3a150d1e8fa013e27b4352b143..4c7d22f4739b1f8d92e22164c944c12287fcca22 100644 (file)
--- 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 6de34f4f662d33767c9db3e28eb04df35521cc6c..73b07610a257c7c030c6e68393fcdba4a1244247 100644 (file)
--- 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 7f573dd415840c86df23cfe304da6e50b381ca7f..619c57315dbafab16f57f736e4dabb0ba88a2021 100644 (file)
--- 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 11bc6c3b1948cd3efc6e426d7da0a9aef48dd147..b5b18d0c5d2cbd0a7745485f75c4e51cc00d35e6 100644 (file)
--- 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 38f681d79e15b1f2636c1f38567a83af8ea1ca97..e3af55bf6ee366b226f7fb32ffb97e662d834a2c 100644 (file)
--- 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 cd8599cc6df62df5823c7a2acc53d63da20d0c37..51971073684b07488031019e8b4b8a6434fe1d43 100644 (file)
--- 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 2751470a1cd41bac253caf1300ae18e6cf592363..7b90e0e31018a7ead7fec28c785ff51692c68041 100644 (file)
--- 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 47b93f4663ac4da8557f63549ec6bf70714a4532..63ccaa7fd107d00404be146b0737b0640fdd0662 100644 (file)
--- 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>