diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/sungem.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 70196bc5fe61..e6880f1c4e8c 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
| 40 | #include <linux/in.h> | 40 | #include <linux/in.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/string.h> | 42 | #include <linux/string.h> |
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| @@ -58,6 +57,7 @@ | |||
| 58 | #include <linux/bitops.h> | 57 | #include <linux/bitops.h> |
| 59 | #include <linux/mutex.h> | 58 | #include <linux/mutex.h> |
| 60 | #include <linux/mm.h> | 59 | #include <linux/mm.h> |
| 60 | #include <linux/gfp.h> | ||
| 61 | 61 | ||
| 62 | #include <asm/system.h> | 62 | #include <asm/system.h> |
| 63 | #include <asm/io.h> | 63 | #include <asm/io.h> |