diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 00:49:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 00:49:59 -0300 |
| commit | b43056538f7130806ba9424c3741e7654df7b64f (patch) | |
| tree | 4f048b4ca41b0e195bf0af674b40b706fec2519b /linux/include | |
| parent | a5566bda8f87f8a8d847fc44d0886a77d5e90cae (diff) | |
| download | mediapointer-dvb-s2-b43056538f7130806ba9424c3741e7654df7b64f.tar.gz mediapointer-dvb-s2-b43056538f7130806ba9424c3741e7654df7b64f.tar.bz2 | |
backport changes at arch/arm and mmc
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/mmc/sdio_ids.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/include/linux/mmc/sdio_ids.h b/linux/include/linux/mmc/sdio_ids.h index 39751c8cd..2dbfb5a05 100644 --- a/linux/include/linux/mmc/sdio_ids.h +++ b/linux/include/linux/mmc/sdio_ids.h @@ -22,6 +22,12 @@ /* * Vendors and devices. Sort key: vendor first, device next. */ +#define SDIO_VENDOR_ID_INTEL 0x0089 +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 +#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404 +#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405 +#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406 #define SDIO_VENDOR_ID_MARVELL 0x02df #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 |