diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-22 00:31:36 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-22 00:31:36 +0200 |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /drivers/net/arcnet/com20020.c | |
| parent | md: don't insist on valid event count for spare devices. (diff) | |
| parent | sysfs: Implement sysfs tagged directory support. (diff) | |
| download | linux-19fdb9eefb21b72edbc365b838502780c392bad6.tar.xz linux-19fdb9eefb21b72edbc365b838502780c392bad6.zip | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/net/arcnet/com20020.c')
| -rw-r--r-- | drivers/net/arcnet/com20020.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 0a74f21409c5..c9e459400ff9 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c @@ -29,7 +29,6 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/ioport.h> -#include <linux/slab.h> #include <linux/errno.h> #include <linux/delay.h> #include <linux/netdevice.h> |