Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / drivers / net / wireless / brcm80211 / include / brcm_hw_ids.h

diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 6996fcc144cfdfa874834481b180afd07c7e20ee..2124a17d0bfdda603d34cf03a76cf550d29bf1be 100644 (file)
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -22,7 +22,6 @@
 
 #define BRCM_USB_VENDOR_ID_BROADCOM    0x0a5c
 #define BRCM_PCIE_VENDOR_ID_BROADCOM   PCI_VENDOR_ID_BROADCOM
-#define BRCM_SDIO_VENDOR_ID_BROADCOM   SDIO_VENDOR_ID_BROADCOM
 
 /* Chipcommon Core Chip IDs */
 #define BRCM_CC_43143_CHIP_ID          43143
@@ -34,6 +33,7 @@
 #define BRCM_CC_4329_CHIP_ID           0x4329
 #define BRCM_CC_4330_CHIP_ID           0x4330
 #define BRCM_CC_4334_CHIP_ID           0x4334
+#define BRCM_CC_43340_CHIP_ID          43340
 #define BRCM_CC_43362_CHIP_ID          43362
 #define BRCM_CC_4335_CHIP_ID           0x4335
 #define BRCM_CC_4339_CHIP_ID           0x4339
@@ -45,16 +45,6 @@
 #define BRCM_CC_43570_CHIP_ID          43570
 #define BRCM_CC_43602_CHIP_ID          43602
 
-/* SDIO Device IDs */
-#define BRCM_SDIO_43143_DEVICE_ID      BRCM_CC_43143_CHIP_ID
-#define BRCM_SDIO_43241_DEVICE_ID      BRCM_CC_43241_CHIP_ID
-#define BRCM_SDIO_4329_DEVICE_ID       BRCM_CC_4329_CHIP_ID
-#define BRCM_SDIO_4330_DEVICE_ID       BRCM_CC_4330_CHIP_ID
-#define BRCM_SDIO_4334_DEVICE_ID       BRCM_CC_4334_CHIP_ID
-#define BRCM_SDIO_43362_DEVICE_ID      BRCM_CC_43362_CHIP_ID
-#define BRCM_SDIO_4335_4339_DEVICE_ID  BRCM_CC_4335_CHIP_ID
-#define BRCM_SDIO_4354_DEVICE_ID       BRCM_CC_4354_CHIP_ID
-
 /* USB Device IDs */
 #define BRCM_USB_43143_DEVICE_ID       0xbd1e
 #define BRCM_USB_43236_DEVICE_ID       0xbd17