Index: /madwifi/branches/madwifi-dfs/scripts/get_arch.mk
===================================================================
--- /madwifi/branches/madwifi-dfs/scripts/get_arch.mk (revision 1806)
+++ /madwifi/branches/madwifi-dfs/scripts/get_arch.mk (revision 3319)
@@ -37,4 +37,11 @@
 endif
 
+# Allow ARCH to be x86
+ifneq (,$(CONFIG_X86))
+ifeq (x86,$(ARCH))
+ARCH-y = $(ARCH)
+endif
+endif
+
 # Don't allow ARCH to be overridden by a different value.
 ifeq (,$(ARCH))
Index: /madwifi/branches/madwifi-dfs/ath_hal/ah_target.inc
===================================================================
--- /madwifi/branches/madwifi-dfs/ath_hal/ah_target.inc (revision 1816)
+++ /madwifi/branches/madwifi-dfs/ath_hal/ah_target.inc (revision 3319)
@@ -26,4 +26,6 @@
 # Determine the target (i.e. which HAL to use).
 # The default is $(ARCH)-elf
+TARGET-$(CONFIG_X86) = i386-elf
+TARGET-$(CONFIG_X86_64) = x86_64-elf
 TARGET-$(CONFIG_CPU_32v4) = armv4-$(ENDIAN)-elf
 TARGET-$(CONFIG_CPU_MIPS32_R1) = mips1-$(ENDIAN)-elf
Index: /madwifi/branches/madwifi-dfs/ath/if_ath_pci.c
===================================================================
--- /madwifi/branches/madwifi-dfs/ath/if_ath_pci.c (revision 3265)
+++ /madwifi/branches/madwifi-dfs/ath/if_ath_pci.c (revision 3319)
@@ -333,5 +333,5 @@
 MODULE_DEVICE_TABLE(pci, ath_pci_id_table);
 
-static struct pci_driver ath_pci_drv_id = {
+static struct pci_driver ath_pci_driver = {
 	.name		= "ath_pci",
 	.id_table	= ath_pci_id_table,
@@ -379,5 +379,5 @@
 	printk(KERN_INFO "%s: %s\n", dev_info, version);
 
-	if (pci_register_driver(&ath_pci_drv_id) < 0) {
+	if (pci_register_driver(&ath_pci_driver) < 0) {
 		printk(KERN_ERR "%s: No devices found, driver not installed.\n", dev_info);
 		return (-ENODEV);
@@ -392,5 +392,5 @@
 {
 	ath_sysctl_unregister();
-	pci_unregister_driver(&ath_pci_drv_id);
+	pci_unregister_driver(&ath_pci_driver);
 
 	printk(KERN_INFO "%s: driver unloaded\n", dev_info);