diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/net/wireless/ipw2100.c | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
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> |