diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 (patch) | |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e /drivers/net/wireless/hermes.c | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 (diff) | |
| parent | b2ab040db85835e54c7559533df7f85902617926 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/hermes.c')
| -rw-r--r-- | drivers/net/wireless/hermes.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c index 21c3d0d227e6..eba0d9d2b7c5 100644 --- a/drivers/net/wireless/hermes.c +++ b/drivers/net/wireless/hermes.c | |||
| @@ -39,17 +39,10 @@ | |||
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | 41 | #include <linux/config.h> |
| 42 | |||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/types.h> | ||
| 45 | #include <linux/threads.h> | ||
| 46 | #include <linux/smp.h> | ||
| 47 | #include <asm/io.h> | ||
| 48 | #include <linux/delay.h> | ||
| 49 | #include <linux/init.h> | ||
| 50 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 51 | #include <linux/net.h> | 44 | #include <linux/init.h> |
| 52 | #include <asm/errno.h> | 45 | #include <linux/delay.h> |
| 53 | 46 | ||
| 54 | #include "hermes.h" | 47 | #include "hermes.h" |
| 55 | 48 | ||