Merge commit 'origin/master' into next

[pandora-kernel.git] / include / linux / mmc / sdio_ids.h

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 09306d4..c7211ab 100644 (file)
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -19,5 +19,13 @@
 #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
+#define SDIO_DEVICE_ID_MARVELL_8688WLAN                0x9104
+#define SDIO_DEVICE_ID_MARVELL_8688BT          0x9105
 
 #endif