diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /drivers/net/octeon | |
| parent | ocfs2_dlmfs: Fix math error when reading LVB. (diff) | |
| parent | ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff) | |
| download | linux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz linux-f9221fd80343285514568da6c5dbda0f87109de8.zip | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'drivers/net/octeon')
| -rw-r--r-- | drivers/net/octeon/octeon_mgmt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index be368e5cbf75..8aadc8e2ddd7 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c @@ -13,6 +13,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> +#include <linux/slab.h> #include <linux/phy.h> #include <linux/spinlock.h> |