Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec59d6f authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

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: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f90d8d47

drivers/net/wireless/orinoco/Makefile

+2 −2
Original line number Original line Diff line number Diff line 
#

#

# Makefile for the orinoco wireless device drivers.

# Makefile for the orinoco wireless device drivers.

#

#

orinoco-objs := main.o fw.o hw.o mic.o scan.o wext.o hermes_dld.o

orinoco-objs := main.o fw.o hw.o mic.o scan.o wext.o hermes_dld.o hermes.o





obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o

obj-$(CONFIG_HERMES)		+= orinoco.o

obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o

obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o

obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o

obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o

obj-$(CONFIG_PLX_HERMES)	+= orinoco_plx.o

obj-$(CONFIG_PLX_HERMES)	+= orinoco_plx.o

drivers/net/wireless/orinoco/hermes.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -45,12 +45,6 @@ 




#include "hermes.h"

#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 */

/* These are maximum timeouts. Most often, card wil react much faster */

#define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */

#define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */

#define CMD_INIT_TIMEOUT (50000) /* in iterations of ~10us */

#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;

	return err;

}

}

EXPORT_SYMBOL(hermes_write_ltv);
 
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);