diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:31:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:31:56 -0800 |
| commit | d779188d2baf436e67fe8816fca2ef53d246900f (patch) | |
| tree | 9bac75842a5611172860feec3c4019ff874a2b89 /drivers/net/wireless/hostap | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-dev-d779188d2baf436e67fe8816fca2ef53d246900f.tar.xz linux-dev-d779188d2baf436e67fe8816fca2ef53d246900f.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c (renamed from drivers/net/wireless/hostap/hostap.c) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/Makefile b/drivers/net/wireless/hostap/Makefile index fc62235bfc24..353ccb93134b 100644 --- a/drivers/net/wireless/hostap/Makefile +++ b/drivers/net/wireless/hostap/Makefile @@ -1,3 +1,4 @@ +hostap-y := hostap_main.o obj-$(CONFIG_HOSTAP) += hostap.o obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap_main.c index 3d2ea61033be..3d2ea61033be 100644 --- a/drivers/net/wireless/hostap/hostap.c +++ b/drivers/net/wireless/hostap/hostap_main.c |