diff options
| author | J. Bruce Fields | 2010-05-04 17:27:05 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2010-05-04 17:29:05 +0200 |
| commit | 5306293c9cd2caf41849cc909281bda628bb989e (patch) | |
| tree | 3be4e8231e2772c8a43ddbef5c6a72c20b3054bb /drivers/net/wan/lmc/lmc_media.c | |
| parent | nfsd4: use local variable in nfs4svc_encode_compoundres (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | kernel-qcow2-linux-5306293c9cd2caf41849cc909281bda628bb989e.tar.gz kernel-qcow2-linux-5306293c9cd2caf41849cc909281bda628bb989e.tar.xz kernel-qcow2-linux-5306293c9cd2caf41849cc909281bda628bb989e.zip | |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
Diffstat (limited to 'drivers/net/wan/lmc/lmc_media.c')
| -rw-r--r-- | drivers/net/wan/lmc/lmc_media.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c index f327674fc93a..5920c996fcdf 100644 --- a/drivers/net/wan/lmc/lmc_media.c +++ b/drivers/net/wan/lmc/lmc_media.c @@ -6,7 +6,6 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/in.h> #include <linux/if_arp.h> |