diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 01:45:37 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 01:45:37 -0400 |
| commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
| tree | 732f4e4794f3c116041242f69754637f75c0dd57 /drivers/net/wireless/ipw2100.c | |
| parent | ed21763e7b0b3fb50e4efd9d4bc17ef5b035d304 (diff) | |
| parent | 08970fc4e0385790a7b093adfaa4165a189f9eb0 (diff) | |
Merge branch 'x86/urgent' into x86/cleanups
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> |