diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/orinoco/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/hermes.c | 18 |
2 files changed, 2 insertions, 20 deletions
diff --git a/drivers/net/wireless/orinoco/Makefile b/drivers/net/wireless/orinoco/Makefile index 2f3e0dd4aa31..1fc7409d6699 100644 --- a/drivers/net/wireless/orinoco/Makefile +++ b/drivers/net/wireless/orinoco/Makefile | |||
@@ -1,9 +1,9 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the orinoco wireless device drivers. | 2 | # Makefile for the orinoco wireless device drivers. |
3 | # | 3 | # |
4 | orinoco-objs := main.o fw.o hw.o mic.o scan.o wext.o hermes_dld.o | 4 | orinoco-objs := main.o fw.o hw.o mic.o scan.o wext.o hermes_dld.o hermes.o |
5 | 5 | ||
6 | obj-$(CONFIG_HERMES) += orinoco.o hermes.o | 6 | obj-$(CONFIG_HERMES) += orinoco.o |
7 | obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o | 7 | obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o |
8 | obj-$(CONFIG_APPLE_AIRPORT) += airport.o | 8 | obj-$(CONFIG_APPLE_AIRPORT) += airport.o |
9 | obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o | 9 | obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o |
diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c index f48358fed9f7..f2c918c2572d 100644 --- a/drivers/net/wireless/orinoco/hermes.c +++ b/drivers/net/wireless/orinoco/hermes.c | |||
@@ -45,12 +45,6 @@ | |||
45 | 45 | ||
46 | #include "hermes.h" | 46 | #include "hermes.h" |
47 | 47 | ||
48 | MODULE_DESCRIPTION("Low-level driver helper for Lucent Hermes chipset" | ||
49 | " and Prism II HFA384x wireless MAC controller"); | ||
50 | MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>" | ||
51 | " & David Gibson <hermes@gibson.dropbear.id.au>"); | ||
52 | MODULE_LICENSE("Dual MPL/GPL"); | ||
53 | |||
54 | /* These are maximum timeouts. Most often, card wil react much faster */ | 48 | /* These are maximum timeouts. Most often, card wil react much faster */ |
55 | #define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */ | 49 | #define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */ |
56 | #define CMD_INIT_TIMEOUT (50000) /* in iterations of ~10us */ | 50 | #define CMD_INIT_TIMEOUT (50000) /* in iterations of ~10us */ |
@@ -540,15 +534,3 @@ int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, | |||
540 | return err; | 534 | return err; |
541 | } | 535 | } |
542 | EXPORT_SYMBOL(hermes_write_ltv); | 536 | EXPORT_SYMBOL(hermes_write_ltv); |
543 | |||
544 | static int __init init_hermes(void) | ||
545 | { | ||
546 | return 0; | ||
547 | } | ||
548 | |||
549 | static void __exit exit_hermes(void) | ||
550 | { | ||
551 | } | ||
552 | |||
553 | module_init(init_hermes); | ||
554 | module_exit(exit_hermes); | ||