1
linux/drivers/net/wireless
David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-06 15:01:18 +00:00
..
bcm43xx
hostap Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-06 15:01:18 +00:00
prism54
zd1211rw
airo_cs.c
airo.c
airo.h
airport.c
arlan-main.c
arlan-proc.c
arlan.h
atmel_cs.c
atmel_pci.c
atmel.c
atmel.h
hermes_rid.h
hermes.c
hermes.h
i82586.h
i82593.h
ipw2100.c
ipw2100.h
ipw2200.c
ipw2200.h
Kconfig
Makefile
netwave_cs.c
orinoco_cs.c
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
orinoco.c
orinoco.h
ray_cs.c
ray_cs.h
rayctl.h
README
spectrum_cs.c
strip.c
todo.txt
wavelan_cs.c
wavelan_cs.h
wavelan_cs.p.h
wavelan.c
wavelan.h
wavelan.p.h
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h

	README
	------

	This directory is mostly for Wireless LAN drivers, in their
various incarnations (ISA, PCI, Pcmcia...).
	This separate directory is needed because a lot of driver work
on different bus (typically PCI + Pcmcia) and share 95% of the
code. This allow the code and the config options to be in one single
place instead of scattered all over the driver tree, which is never
100% satisfactory.

	Note : if you want more info on the topic of Wireless LANs,
you are kindly invited to have a look at the Wireless Howto :
		http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
	Some Wireless LAN drivers, like orinoco_cs, require the use of
Wireless Tools to be configured :
		http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html

	Special notes for distribution maintainers :
	1) wvlan_cs will be discontinued soon in favor of orinoco_cs
	2) Please add Wireless Tools support in your scripts

	Have fun...

	Jean