diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-19 00:15:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-19 00:15:44 -0400 |
| commit | 8e0f36ec371ef4804da46d962d5272b3efb04481 (patch) | |
| tree | 7207bb6ffa31c1fe6bf7cddb33561a4ebebd5cc4 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | d28934ad8a4e87203a95de9c376611de8bc2f013 (diff) | |
| parent | 3eb75aac8907e7ea36f0d078b2cc7393986001cf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f3d139b663e6..cbc01a00eaf4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 31 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |