diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 09:26:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 09:26:39 -0300 |
| commit | 70b6522b7a4c42541d81f2460e3be8946e22856d (patch) | |
| tree | 47c109ada3e624ef0e772f97730aef28fa3b578c /linux/include | |
| parent | 14db198f2e10236768bd1e8f685e7d65880ca406 (diff) | |
| parent | 55478ad148cbf89cd3d99872759960c8411ada6d (diff) | |
| download | mediapointer-dvb-s2-70b6522b7a4c42541d81f2460e3be8946e22856d.tar.gz mediapointer-dvb-s2-70b6522b7a4c42541d81f2460e3be8946e22856d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/hcw-ids
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | linux/include/media/soc_camera_platform.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index 493435bcd..01d67ba9e 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -60,7 +60,7 @@ #define I2C_DRIVERID_WM8775 69 /* wm8775 audio processor */ #define I2C_DRIVERID_CS53L32A 70 /* cs53l32a audio processor */ #define I2C_DRIVERID_CX25840 71 /* cx2584x video encoder */ -#define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ +#define I2C_DRIVERID_SAA7127 72 /* saa7127 video encoder */ #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ diff --git a/linux/include/media/soc_camera_platform.h b/linux/include/media/soc_camera_platform.h index 851f18220..1d092b467 100644 --- a/linux/include/media/soc_camera_platform.h +++ b/linux/include/media/soc_camera_platform.h @@ -1,3 +1,13 @@ +/* + * Generic Platform Camera Driver Header + * + * Copyright (C) 2008 Magnus Damm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + #ifndef __SOC_CAMERA_H__ #define __SOC_CAMERA_H__ @@ -9,6 +19,7 @@ struct soc_camera_platform_info { unsigned long format_depth; struct v4l2_pix_format format; unsigned long bus_param; + void (*power)(int); int (*set_capture)(struct soc_camera_platform_info *info, int enable); }; |