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/hamachi.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 373546dd0831..5d6f13879592 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
| @@ -153,7 +153,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 153 | #include <linux/time.h> | 153 | #include <linux/time.h> |
| 154 | #include <linux/errno.h> | 154 | #include <linux/errno.h> |
| 155 | #include <linux/ioport.h> | 155 | #include <linux/ioport.h> |
| 156 | #include <linux/slab.h> | ||
| 157 | #include <linux/interrupt.h> | 156 | #include <linux/interrupt.h> |
| 158 | #include <linux/pci.h> | 157 | #include <linux/pci.h> |
| 159 | #include <linux/init.h> | 158 | #include <linux/init.h> |