diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-29 12:50:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-29 12:50:38 +1000 |
| commit | 6d74c338e01d9fb342865c2ea59ccffa7fd73292 (patch) | |
| tree | e4ec85382a814e984b64b03568bd167e043b2495 /include | |
| parent | c6eaddf7cb5c550c77ee373f0fe6b6a470116839 (diff) | |
| parent | c74209f1785241ab5b64809c92ce2050b5a40642 (diff) | |
Merge commit 'v4l-dvb/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 8 | ||||
| -rw-r--r-- | include/media/v4l2-device.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index ea1bf5ba092f..3d7533d1eda1 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -24,6 +24,14 @@ */ #define SDIO_VENDOR_ID_MARVELL 0x02df +#define SDIO_VENDOR_ID_SIANO 0x039a + #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 +#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 +#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 +#define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 +#define SDIO_DEVICE_ID_SIANO_NICE 0x0202 +#define SDIO_DEVICE_ID_SIANO_VEGA_A0 0x0300 +#define SDIO_DEVICE_ID_SIANO_VENICE 0x0301 #endif diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 0dd3e8e8653e..9afd39fb2cfc 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h @@ -30,7 +30,7 @@ basic V4L2 device-level support. */ -#define V4L2_DEVICE_NAME_SIZE (BUS_ID_SIZE + 16) +#define V4L2_DEVICE_NAME_SIZE (20 + 16) struct v4l2_device { /* dev->driver_data points to this struct. |