summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/Makefile
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2009-02-04 23:05:58 +0000
committerJohn W. Linville <linville@tuxdriver.com>2009-02-13 13:44:37 -0500
commitdec59d6faffb44e741d9c19ffdf368d69a968a54 (patch)
tree77c0959f40259564f92022207cdbb826081a24ed /drivers/net/wireless/orinoco/Makefile
parentf90d8d4789eba79b0a715e41aba4c09403088847 (diff)
downloadlinux-dec59d6faffb44e741d9c19ffdf368d69a968a54.tar.bz2
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/Makefile')
-rw-r--r--drivers/net/wireless/orinoco/Makefile4
1 files changed, 2 insertions, 2 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 @@
#
# 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_APPLE_AIRPORT) += airport.o
obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o