rendered paste bodydiff -ru madwifi-0.9.3.3a/ath/if_ath_pci.c madwifi-0.9.3.3b/ath/if_ath_pci.c
--- madwifi-0.9.3.3/ath/if_ath_pci.c 2008-02-11 08:51:40.000000000 -0800
+++ madwifi-0.9.3.3/ath/if_ath_pci.c 2008-02-11 08:58:59.000000000 -0800
@@ -329,7 +329,7 @@
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,
.probe = ath_pci_probe,
@@ -385,7 +385,7 @@
{
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("ath_pci: No devices found, driver not installed.\n");
return (-ENODEV);
}
@@ -398,7 +398,7 @@
exit_ath_pci(void)
{
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);
}
diff -ru madwifi-0.9.3.3a/ath_hal/ah_target.inc madwifi-0.9.3.3b/ath_hal/ah_target.inc
--- madwifi-0.9.3.3/ath_hal/ah_target.inc 2008-02-11 08:51:40.000000000 -0800
+++ madwifi-0.9.3.3/ath_hal/ah_target.inc 2008-02-11 08:57:08.000000000 -0800
@@ -25,6 +25,8 @@
# 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
TARGET-$(CONFIG_CPU_MIPS32_R2) = mips-$(ENDIAN)-elf
diff -ru madwifi-0.9.3.3a/scripts/get_arch.mk madwifi-0.9.3.3b/scripts/get_arch.mk
--- madwifi-0.9.3.3/scripts/get_arch.mk 2008-02-11 08:51:40.000000000 -0800
+++ madwifi-0.9.3.3/scripts/get_arch.mk 2008-02-11 08:55:59.000000000 -0800
@@ -36,6 +36,13 @@
$(Cannot determine ARCH)
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))
ARCH = $(ARCH-y)