diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/net/starfire.c | |
| parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/starfire.c')
| -rw-r--r-- | drivers/net/starfire.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 38b2b0a3ce96..d167deda9a53 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -147,7 +147,6 @@ TODO: - fix forced speed/duplexing code (broken a long time ago, when | |||
| 147 | #define DRV_RELDATE "October 3, 2005" | 147 | #define DRV_RELDATE "October 3, 2005" |
| 148 | 148 | ||
| 149 | #include <linux/config.h> | 149 | #include <linux/config.h> |
| 150 | #include <linux/version.h> | ||
| 151 | #include <linux/module.h> | 150 | #include <linux/module.h> |
| 152 | #include <linux/kernel.h> | 151 | #include <linux/kernel.h> |
| 153 | #include <linux/pci.h> | 152 | #include <linux/pci.h> |