diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/mmc | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index ea1bf5ba092f..39751c8cde9c 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h | |||
| @@ -25,5 +25,15 @@ | |||
| 25 | 25 | ||
| 26 | #define SDIO_VENDOR_ID_MARVELL 0x02df | 26 | #define SDIO_VENDOR_ID_MARVELL 0x02df |
| 27 | #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 | 27 | #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 |
| 28 | #define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104 | ||
| 29 | #define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105 | ||
| 30 | |||
| 31 | #define SDIO_VENDOR_ID_SIANO 0x039a | ||
| 32 | #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 | ||
| 33 | #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 | ||
| 34 | #define SDIO_DEVICE_ID_SIANO_VEGA_A0 0x0300 | ||
| 35 | #define SDIO_DEVICE_ID_SIANO_VENICE 0x0301 | ||
| 36 | #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 | ||
| 37 | #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 | ||
| 28 | 38 | ||
| 29 | #endif | 39 | #endif |