Merge branch 'master' into for-next

[~andy/linux] / drivers / isdn / hardware / mISDN / hfcmulti.c

diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 8affba3e569d888dfea0518d3610280e1ac6bb09..095ed76ebe8056e3d7d816accfc1e32aea1fdf84 100644 (file)
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -117,7 +117,7 @@
  *     NOTE: only one mode value must be given for every card.
  *     -> See hfc_multi.h for HFC_IO_MODE_* values
  *     By default, the IO mode is pci memory IO (MEMIO).
- *     Some cards requre specific IO mode, so it cannot be changed.
+ *     Some cards require specific IO mode, so it cannot be changed.
  *     It may be usefull to set IO mode to register io (REGIO) to solve
  *     PCI bridge problems.
  *     If unsure, don't give this parameter.
@@ -153,6 +153,7 @@
 #define HFC_MULTI_VERSION      "2.03"
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mISDNhw.h>