diff options
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h | 8 | ||||
-rw-r--r-- | include/linux/mmc/sdio_ids.h | 9 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c index 07015e198b3c..68dd999df98e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | |||
@@ -47,8 +47,6 @@ | |||
47 | 47 | ||
48 | #define SDIOH_API_ACCESS_RETRY_LIMIT 2 | 48 | #define SDIOH_API_ACCESS_RETRY_LIMIT 2 |
49 | 49 | ||
50 | #define SDIO_VENDOR_ID_BROADCOM 0x02d0 | ||
51 | |||
52 | #define DMA_ALIGN_MASK 0x03 | 50 | #define DMA_ALIGN_MASK 0x03 |
53 | 51 | ||
54 | #define SDIO_FUNC1_BLOCKSIZE 64 | 52 | #define SDIO_FUNC1_BLOCKSIZE 64 |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c index 6aa6ba02b036..a0b8409063f1 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
20 | #include <linux/mmc/card.h> | 20 | #include <linux/mmc/card.h> |
21 | #include <linux/mmc/sdio_func.h> | 21 | #include <linux/mmc/sdio_func.h> |
22 | #include <linux/mmc/sdio_ids.h> | ||
22 | #include <linux/ssb/ssb_regs.h> | 23 | #include <linux/ssb/ssb_regs.h> |
23 | #include <linux/bcma/bcma.h> | 24 | #include <linux/bcma/bcma.h> |
24 | 25 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h index d0f4b45b24c7..7ea424e20773 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h | |||
@@ -54,14 +54,6 @@ | |||
54 | 54 | ||
55 | #define BRCMF_MAX_CORENUM 6 | 55 | #define BRCMF_MAX_CORENUM 6 |
56 | 56 | ||
57 | /* SDIO device ID */ | ||
58 | #define SDIO_DEVICE_ID_BROADCOM_43143 43143 | ||
59 | #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 | ||
60 | #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 | ||
61 | #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 | ||
62 | #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 | ||
63 | #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 | ||
64 | |||
65 | struct chip_core_info { | 57 | struct chip_core_info { |
66 | u16 id; | 58 | u16 id; |
67 | u16 rev; | 59 | u16 rev; |
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 9f03feedc8e7..d8836623f36a 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h | |||
@@ -23,6 +23,15 @@ | |||
23 | /* | 23 | /* |
24 | * Vendors and devices. Sort key: vendor first, device next. | 24 | * Vendors and devices. Sort key: vendor first, device next. |
25 | */ | 25 | */ |
26 | #define SDIO_VENDOR_ID_BROADCOM 0x02d0 | ||
27 | #define SDIO_DEVICE_ID_BROADCOM_43143 43143 | ||
28 | #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 | ||
29 | #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 | ||
30 | #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 | ||
31 | #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 | ||
32 | #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 | ||
33 | #define SDIO_DEVICE_ID_BROADCOM_43362 43362 | ||
34 | |||
26 | #define SDIO_VENDOR_ID_INTEL 0x0089 | 35 | #define SDIO_VENDOR_ID_INTEL 0x0089 |
27 | #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 | 36 | #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 |
28 | #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 | 37 | #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 |