aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:01:48 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:01:48 +0200
commitf1f8ac32dddfb765e8d57fdb3b3e9c10727a0873 (patch)
treee261e1490ba2171d66a2b4940478d6a7a9c98cb5 /include
parent1eec1fc0f0dd4463b06cebaf9825def6acad9a23 (diff)
parent4dbd5b751767bf88ffdda5d55646738871c751ad (diff)
Merge branch 'ar6000-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmc/sdio_ids.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 33b2ea09a4a..1beba57e5af 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -43,4 +43,9 @@
#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
+#define SDIO_DEVICE_ID_MARVELL_88W8688 0x9104
+#define SDIO_VENDOR_ID_ATHEROS 0x0271
+#define SDIO_DEVICE_ID_ATHEROS_AR6001 0x0100
+#define SDIO_DEVICE_ID_ATHEROS_AR6002 0x0200
+
#endif