diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /include/linux/mmc/sdio_ids.h | |
| parent | ad8affd972a705a38e769859c50ee8e749b631da (diff) | |
| parent | d3feaf5ad12259927039a675cfb25dc342b403ab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'include/linux/mmc/sdio_ids.h')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index ea1bf5ba092f..c7211ab6dd4b 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h | |||
| @@ -25,5 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #define SDIO_VENDOR_ID_MARVELL 0x02df | 26 | #define SDIO_VENDOR_ID_MARVELL 0x02df |
| 27 | #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 | 27 | #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 |
| 28 | #define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104 | ||
| 29 | #define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105 | ||
| 28 | 30 | ||
| 29 | #endif | 31 | #endif |