diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2009-02-04 23:05:58 +0000 | 
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:44:37 -0500 | 
| commit | dec59d6faffb44e741d9c19ffdf368d69a968a54 (patch) | |
| tree | 77c0959f40259564f92022207cdbb826081a24ed /drivers/net/wireless/orinoco/hermes.c | |
| parent | f90d8d4789eba79b0a715e41aba4c09403088847 (diff) | |
| download | olio-linux-3.10-dec59d6faffb44e741d9c19ffdf368d69a968a54.tar.xz olio-linux-3.10-dec59d6faffb44e741d9c19ffdf368d69a968a54.zip  | |
orinoco: hermes doesn't need to be a separate module
Just compile it into the orinoco module. If we merge USB support, the
module can then be split as appropriate.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/hermes.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/hermes.c | 18 | 
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c index f48358fed9f..f2c918c2572 100644 --- a/drivers/net/wireless/orinoco/hermes.c +++ b/drivers/net/wireless/orinoco/hermes.c @@ -45,12 +45,6 @@  #include "hermes.h" -MODULE_DESCRIPTION("Low-level driver helper for Lucent Hermes chipset" -		   " and Prism II HFA384x wireless MAC controller"); -MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>" -	" & David Gibson <hermes@gibson.dropbear.id.au>"); -MODULE_LICENSE("Dual MPL/GPL"); -  /* These are maximum timeouts. Most often, card wil react much faster */  #define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */  #define CMD_INIT_TIMEOUT (50000) /* in iterations of ~10us */ @@ -540,15 +534,3 @@ int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,  	return err;  }  EXPORT_SYMBOL(hermes_write_ltv); - -static int __init init_hermes(void) -{ -	return 0; -} - -static void __exit exit_hermes(void) -{ -} - -module_init(init_hermes); -module_exit(exit_hermes);  |