diff options
| author | David S. Miller | 2010-04-11 23:53:53 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-04-11 23:53:53 +0200 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /drivers/net/ppp_generic.c | |
| parent | xfrm: Fix crashes in xfrm_lookup() (diff) | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| download | kernel-qcow2-linux-871039f02f8ec4ab2e5e9010718caa8e085786f1.tar.gz kernel-qcow2-linux-871039f02f8ec4ab2e5e9010718caa8e085786f1.tar.xz kernel-qcow2-linux-871039f02f8ec4ab2e5e9010718caa8e085786f1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 8a0dd8a843a9..35f195329fdd 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -46,6 +46,7 @@ #include <linux/stddef.h> #include <linux/device.h> #include <linux/mutex.h> +#include <linux/slab.h> #include <net/slhc_vj.h> #include <asm/atomic.h> |