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/sb1000.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 9f83a1197375..abc8eefdd4b6 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -42,7 +42,6 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 42 | #include <linux/errno.h> | 42 | #include <linux/errno.h> |
| 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ | 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ |
| 44 | #include <linux/in.h> | 44 | #include <linux/in.h> |
| 45 | #include <linux/slab.h> | ||
| 46 | #include <linux/ioport.h> | 45 | #include <linux/ioport.h> |
| 47 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 48 | #include <linux/if_arp.h> | 47 | #include <linux/if_arp.h> |
| @@ -52,6 +51,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 52 | #include <linux/pnp.h> | 51 | #include <linux/pnp.h> |
| 53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
| 54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |
| 54 | #include <linux/gfp.h> | ||
| 55 | 55 | ||
| 56 | #include <asm/io.h> | 56 | #include <asm/io.h> |
| 57 | #include <asm/processor.h> | 57 | #include <asm/processor.h> |