summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-07-25 20:02:48 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-25 20:26:50 (GMT)
commitbcc27c82bac2622e352c732a0bda49651e1799b3 (patch)
tree29720bb090d5b2a21cb2a02613e6d2c4826d21d0
parentc325f9a9edf24dfc13145b5fce792aec577fe381 (diff)
downloadlinux-fsl-qoriq-bcc27c82bac2622e352c732a0bda49651e1799b3.tar.xz
staging: comedi: Add missing #include <linux/slab.h>
sparc64 allmodconfig: drivers/staging/comedi/drivers/addi_apci_2032.c: In function 'apci2032_auto_attach': drivers/staging/comedi/drivers/addi_apci_2032.c:328:3: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration] drivers/staging/comedi/drivers/addi_apci_2032.c:328:11: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/staging/comedi/drivers/addi_apci_2032.c: In function 'apci2032_detach': drivers/staging/comedi/drivers/addi_apci_2032.c:350:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration] drivers/staging/comedi/drivers/amplc_pci224.c: In function 'pci224_attach_common': drivers/staging/comedi/drivers/amplc_pci224.c:1289:2: error: implicit declaration of function 'kmalloc' [-Werror=implicit-function-declaration] drivers/staging/comedi/drivers/amplc_pci224.c:1289:23: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/staging/comedi/drivers/amplc_pci224.c:1296:24: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/staging/comedi/drivers/amplc_pci224.c:1303:25: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/staging/comedi/drivers/amplc_pci224.c:1348:42: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/staging/comedi/drivers/amplc_pci224.c: In function 'pci224_detach': drivers/staging/comedi/drivers/amplc_pci224.c:1474:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration] Introduced by commit 0bdab509bf9c6d838dc0a3b1d68bbf841fc20b5a ("staging: comedi: use comedi_alloc_devpriv()"), which removed some inclusions of <linux/slab.h>. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_2032.c1
-rw-r--r--drivers/staging/comedi/drivers/amplc_pci224.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index cb5d26a..6b0ea16 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -25,6 +25,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
+#include <linux/slab.h>
#include "../comedidev.h"
#include "addi_watchdog.h"
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 2fc56c4..179de53 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -101,6 +101,7 @@ Caveats:
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
+#include <linux/slab.h>
#include "../comedidev.h"