diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/net/skfp/skfddi.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
| download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'drivers/net/skfp/skfddi.c')
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 1921a54ea995..d9016b75abc2 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -78,13 +78,13 @@ static const char * const boot_msg = #include <linux/kernel.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/netdevice.h> #include <linux/fddidevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> +#include <linux/gfp.h> #include <asm/byteorder.h> #include <asm/io.h> |