iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -3767,10 +3767,10 @@ static void __devexit iwl_pci_remove(str
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2010-01-11 08:47:03.000000000 -0800
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2010-01-11 08:54:05.000000000 -0800
+@@ -3767,10 +3767,10 @@
/* Hardware specific file defines the PCI IDs table for that hardware module */
- static struct pci_device_id iwl_hw_card_ids[] = {
+ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
-#ifdef CONFIG_IWL4965
+#ifdef CONFIG_COMPAT_IWL4965
{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},