diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/net/wireless/ipw2100.c | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index c6f886ec08a3..19a401c4a0dc 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -157,7 +157,6 @@ that only one external action is invoked at a time. | |||
| 157 | #include <linux/stringify.h> | 157 | #include <linux/stringify.h> |
| 158 | #include <linux/tcp.h> | 158 | #include <linux/tcp.h> |
| 159 | #include <linux/types.h> | 159 | #include <linux/types.h> |
| 160 | #include <linux/version.h> | ||
| 161 | #include <linux/time.h> | 160 | #include <linux/time.h> |
| 162 | #include <linux/firmware.h> | 161 | #include <linux/firmware.h> |
| 163 | #include <linux/acpi.h> | 162 | #include <linux/acpi.h> |