diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/net/lasi_82596.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/lasi_82596.c')
| -rw-r--r-- | drivers/net/lasi_82596.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index 0edcd125fd61..6b49fc4bd1a1 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | #include <linux/etherdevice.h> | 81 | #include <linux/etherdevice.h> |
| 82 | #include <linux/skbuff.h> | 82 | #include <linux/skbuff.h> |
| 83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
| 84 | #include <linux/pci.h> | ||
| 85 | #include <linux/types.h> | 84 | #include <linux/types.h> |
| 86 | #include <linux/bitops.h> | 85 | #include <linux/bitops.h> |
| 87 | 86 | ||