diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /drivers/net/ni5010.c | |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/net/ni5010.c')
| -rw-r--r-- | drivers/net/ni5010.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index c16cbfb4061b..3892330f244a 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | #include <linux/string.h> | 51 | #include <linux/string.h> |
| 52 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 53 | #include <linux/ioport.h> | 53 | #include <linux/ioport.h> |
| 54 | #include <linux/slab.h> | ||
| 55 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 56 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
| 57 | #include <linux/init.h> | 56 | #include <linux/init.h> |