aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-12-27 19:42:20 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-12-27 19:42:20 +0100
commit5e5d518ecad86cc891d91c88d3b144eb30339bca (patch)
tree0d8079e83722a7d72fabf3894e6da73e7ab3ee24 /include
parent86ec248ac3250b7187f430fded42d43284313dd6 (diff)
parent43a6a280fe7c1b4469f3956c33e25f9a768ade34 (diff)
Merge branch 'ar6000-2.6.32' into om-gta02-2.6.32
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 2dbfb5a0599..d0f3510bf9e 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -42,4 +42,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