diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
| commit | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch) | |
| tree | 1db633712bd47ce72ac5a1aed62b3417733ac63a /drivers/net/wireless/Makefile | |
| parent | 1e231efe50ffe4d291be24d2fe393188de9c4b08 (diff) | |
| parent | 3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 0953cc0cdee6..3a6f7ba326ca 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
| @@ -22,6 +22,8 @@ obj-$(CONFIG_APPLE_AIRPORT) += airport.o | |||
| 22 | obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o | 22 | obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o |
| 23 | obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o | 23 | obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o |
| 24 | obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o | 24 | obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o |
| 25 | obj-$(CONFIG_NORTEL_HERMES) += orinoco_nortel.o | ||
| 26 | obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o | ||
| 25 | 27 | ||
| 26 | obj-$(CONFIG_AIRO) += airo.o | 28 | obj-$(CONFIG_AIRO) += airo.o |
| 27 | obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o | 29 | obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o |