diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/net/wireless/b43legacy/main.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 2541c81932f0..1cb77db5c292 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 35 | #include <linux/if_arp.h> | 35 | #include <linux/if_arp.h> |
| 36 | #include <linux/etherdevice.h> | 36 | #include <linux/etherdevice.h> |
| 37 | #include <linux/version.h> | ||
| 38 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
| 39 | #include <linux/wireless.h> | 38 | #include <linux/wireless.h> |
| 40 | #include <linux/workqueue.h> | 39 | #include <linux/workqueue.h> |