diff -urpN linux-2.6.12.org/drivers/net/wireless/Kconfig linux-2.6.12/drivers/net/wireless/Kconfig
--- linux-2.6.12.org/drivers/net/wireless/Kconfig	Sun Jun 19 16:10:25 2005
+++ linux-2.6.12/drivers/net/wireless/Kconfig	Mon Jun 27 22:48:01 2005
@@ -355,6 +355,63 @@ config PRISM54
 	  say M here and read <file:Documentation/modules.txt>.  The module
 	  will be called prism54.ko.

+config ACX
+	tristate "TI acx100/acx111 802.11b/g wireless chipsets"
+	depends on NET_RADIO && EXPERIMENTAL
+	---help---
+	A driver for 802.11b/g wireless cards based on
+	Texas Instruments acx100 and acx111 chipsets.
+
+	This driver supports Host AP mode that allows
+	your computer to act as an IEEE 802.11 access point.
+	This driver is quite new and is experimental.
+
+	These chipsets need their firmware loaded at startup.
+	You will need to provide a firmware image via hotplug.
+
+	Firmware may be in a form of single image around 80kb in size
+	(a 'combined' firmware) or two images - main image (again ~80kb)
+	and radio image (~10kb).
+
+	Firmware images are requested from hotplug using following names:
+
+	tiacx100 - main firmware image for acx100 chipset
+	tiacx100rNN - radio acx100 firmware for radio type NN
+	tiacx100cNN - combined acx100 firmware for radio type NN
+	tiacx111 - main acx111 firmware
+	tiacx111rNN - radio acx111 firmware for radio type NN
+	tiacx111cNN - combined acx111 firmware for radio type NN
+
+	Driver will attempt to load combined image first.
+	If no such image is found, it will try to load main image
+	and radio image instead.
+
+	Firmware files are not covered by GPL and are not distributed
+	with this driver for legal reasons.
+
+	Texas Instruments did not take part in development of this driver
+	in any way, shape or form.
+
+config ACX_PCI
+	tristate "TI acx100/acx111 802.11b/g PCI"
+	depends on PCI && ACX
+	---help---
+	A driver for PCI and CardBus incarnations of acx100 and acx111.
+
+	This driver is quite new and is experimental.
+
+	The driver can be compiled as a module and will be named "acx_pci".
+
+config ACX_USB
+	tristate "TI acx100/acx111 802.11b/g USB"
+	depends on USB && ACX
+	---help---
+	A driver for USB incarnation of acx100 and acx111.
+
+	This driver is quite new and is experimental.
+
+	The driver can be compiled as a module and will be named "acx_usb".
+
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
 	bool
diff -urpN linux-2.6.12.org/drivers/net/wireless/Makefile linux-2.6.12/drivers/net/wireless/Makefile
--- linux-2.6.12.org/drivers/net/wireless/Makefile	Tue Oct 19 00:55:36 2004
+++ linux-2.6.12/drivers/net/wireless/Makefile	Mon Jun 27 22:48:57 2005
@@ -27,6 +27,7 @@ obj-$(CONFIG_PCI_ATMEL)         += atmel
 obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o

 obj-$(CONFIG_PRISM54)		+= prism54/
+obj-$(CONFIG_ACX)		+= acx/

 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
