diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:02:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:02:43 -0300 |
commit | f098c162f9ceb707a0674bf3ca336b95841877e6 (patch) | |
tree | 4f4ab7aaf80e71b33b207b661488dc82a5b290f7 /linux/include/asm-arm/arch-pxa/camera.h | |
parent | 5e205c91d2868551f704cbcfcaed6a39e3702160 (diff) | |
parent | 89ddb8a06ccaa14b09c81e81dbacc4ce70285129 (diff) | |
download | mediapointer-dvb-s2-f098c162f9ceb707a0674bf3ca336b95841877e6.tar.gz mediapointer-dvb-s2-f098c162f9ceb707a0674bf3ca336b95841877e6.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/asm-arm/arch-pxa/camera.h')
-rw-r--r-- | linux/include/asm-arm/arch-pxa/camera.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/include/asm-arm/arch-pxa/camera.h b/linux/include/asm-arm/arch-pxa/camera.h index 39516ced8..31abe6d51 100644 --- a/linux/include/asm-arm/arch-pxa/camera.h +++ b/linux/include/asm-arm/arch-pxa/camera.h @@ -36,8 +36,6 @@ struct pxacamera_platform_data { int (*init)(struct device *); - int (*power)(struct device *, int); - int (*reset)(struct device *, int); unsigned long flags; unsigned long mclk_10khz; |