commit 730d44a43179f9510e5f17822ce623cddd8f1b06
Author: Jiri Slaby <ku@bellona.localdomain>
Date:   Sun Jun 17 14:12:41 2007 +0200

    fix ids in ath5k_hw

diff --git a/openhal/ath5k_hw.c b/openhal/ath5k_hw.c
index 17814ca..85f4e88 100644
--- a/openhal/ath5k_hw.c
+++ b/openhal/ath5k_hw.c
@@ -22,6 +22,8 @@
  * (Please have a look at ar5xxx.h for further information)
  */
 
+#include <linux/pci.h>
+
 #include <asm/unaligned.h>
 
 #include "ah_devid.h"
@@ -40,32 +42,32 @@ static const struct {
 	/*
 	 * From pcidevs_data.h
 	 */
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5210, 		AR5K_AR5210},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5210_AP, 		AR5K_AR5210},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5210_DEFAULT, 	AR5K_AR5210},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5211,		AR5K_AR5211},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5211_DEFAULT,	AR5K_AR5211},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5311,		AR5K_AR5211},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5211_FPGA11B, 	AR5K_AR5211},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5211_LEGACY, 	AR5K_AR5211},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212,		AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_DEFAULT, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_FPGA, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_IBM, 	AR5K_AR5212},
-	{ PCI_VENDOR_3COM,    	PCI_PRODUCT_3COM_3CRDAG675, 		AR5K_AR5212},
-	{ PCI_VENDOR_3COM2,   	PCI_PRODUCT_3COM2_3CRPAG175, 		AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_REV2, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_REV7, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_REV8, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0014, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0015, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0016, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0017, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0018, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5212_0019, 	AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR2413, 		AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5413, 		AR5K_AR5212},
-	{ PCI_VENDOR_ATHEROS, 	PCI_PRODUCT_ATHEROS_AR5424, 		AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5210, 		AR5K_AR5210},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5210_AP, 	AR5K_AR5210},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT, 	AR5K_AR5210},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211,		AR5K_AR5211},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT,	AR5K_AR5211},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5311,		AR5K_AR5211},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B, 	AR5K_AR5211},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY, 	AR5K_AR5211},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212,		AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_FPGA, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_IBM, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_3COM,	 PCI_DEVICE_ID_3COM_3CRDAG675,		AR5K_AR5212},
+	{ PCI_VENDOR_ID_3COM_2,	 PCI_DEVICE_ID_3COM_2_3CRPAG175, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_REV2, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_REV7, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_REV8, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0014, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0015, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0016, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0017, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0018, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_0019, 	AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR2413, 		AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5413, 		AR5K_AR5212},
+	{ PCI_VENDOR_ID_ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5424, 		AR5K_AR5212},
 };
 
 /*Rate tables*/
@@ -418,9 +420,9 @@ ath5k_hw_init(u16 device, void *sc, void __iomem *sh, AR5K_STATUS *status)
 	hal->ah_ant_diversity = AR5K_TUNE_ANT_DIVERSITY;
 
 	switch (device) {
-		case PCI_PRODUCT_ATHEROS_AR2413:
-		case PCI_PRODUCT_ATHEROS_AR5413:
-		case PCI_PRODUCT_ATHEROS_AR5424:
+		case PCI_DEVICE_ID_ATHEROS_AR2413:
+		case PCI_DEVICE_ID_ATHEROS_AR5413:
+		case PCI_DEVICE_ID_ATHEROS_AR5424:
 			/*
 			 * Known single chip solutions
 			 */