summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:36:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:36:39 -0300
commitab4c84b189fc450ac5edee0d4461b0c1bf0c86c6 (patch)
tree7ed45c785e64fb0f40ec4a20d02f03c9a07e851b /linux/include
parent944b8fa4c78bec5e481f59eaa0c02d2928be6309 (diff)
downloadmediapointer-dvb-s2-ab4c84b189fc450ac5edee0d4461b0c1bf0c86c6.tar.gz
mediapointer-dvb-s2-ab4c84b189fc450ac5edee0d4461b0c1bf0c86c6.tar.bz2
backport some files that are maintained elsewhere
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/mmc/sdio_ids.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/include/linux/mmc/sdio_ids.h b/linux/include/linux/mmc/sdio_ids.h
index 3d7533d1e..39751c8cd 100644
--- a/linux/include/linux/mmc/sdio_ids.h
+++ b/linux/include/linux/mmc/sdio_ids.h
@@ -24,14 +24,16 @@
*/
#define SDIO_VENDOR_ID_MARVELL 0x02df
-#define SDIO_VENDOR_ID_SIANO 0x039a
-
#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
-#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
-#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
+#define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104
+#define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105
+
+#define SDIO_VENDOR_ID_SIANO 0x039a
#define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201
#define SDIO_DEVICE_ID_SIANO_NICE 0x0202
#define SDIO_DEVICE_ID_SIANO_VEGA_A0 0x0300
#define SDIO_DEVICE_ID_SIANO_VENICE 0x0301
+#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
+#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
#endif