diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
| commit | ca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch) | |
| tree | dad605a1b3142e85d9ddc08a77d62f6bf09f22cc /include | |
| parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
| parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 27061909203..1ee06dfc883 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -27,6 +27,7 @@ #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 #define SDIO_DEVICE_ID_MARVELL_88W8688 0x9104 #define SDIO_VENDOR_ID_ATHEROS 0x0271 -#define SDIO_DEVICE_ID_ATHEROS_AR6000 0x0100 +#define SDIO_DEVICE_ID_ATHEROS_AR6001 0x0100 +#define SDIO_DEVICE_ID_ATHEROS_AR6002 0x0200 #endif |