orinoco: hermes doesn't need to be a separate module
authorDavid Kilroy <kilroyd@googlemail.com>
Wed, 4 Feb 2009 23:05:58 +0000 (23:05 +0000)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 13 Feb 2009 18:44:37 +0000 (13:44 -0500)
commitdec59d6faffb44e741d9c19ffdf368d69a968a54
tree77c0959f40259564f92022207cdbb826081a24ed
parentf90d8d4789eba79b0a715e41aba4c09403088847
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>
drivers/net/wireless/orinoco/Makefile
drivers/net/wireless/orinoco/hermes.c