diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
| commit | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (patch) | |
| tree | 4428204f4be7c7dfa55d674647c358ebc452063d /include/linux | |
| parent | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 (diff) | |
| parent | net: libertas sdio driver (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
net: libertas sdio driver
mmc: at91_mci: cleanup: use MCI_ERRORS
mmc: possible leak in mmc_read_ext_csd
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 09306d47ff5e..ea1bf5ba092f 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -19,5 +19,11 @@ #define SDIO_CLASS_WLAN 0x07 /* WLAN interface */ #define SDIO_CLASS_ATA 0x08 /* Embedded SDIO-ATA std interface */ +/* + * Vendors and devices. Sort key: vendor first, device next. + */ + +#define SDIO_VENDOR_ID_MARVELL 0x02df +#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 #endif |