summaryrefslogtreecommitdiff
path: root/linux/include/asm-arm
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-23 08:43:33 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-23 08:43:33 +0200
commite7e0275a6146c377a318ea69ba83532b2ecf4080 (patch)
tree908890d5dfd5a4e4575c4f3c74031350d4402317 /linux/include/asm-arm
parent2019504e7d4a9558886c6327b9f6c684e9f5b252 (diff)
parentab19cb308e86c5aeb0531bbbf5bfb2c09d3423a3 (diff)
downloadmediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.gz
mediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.bz2
merge: from v4l-dvb
Diffstat (limited to 'linux/include/asm-arm')
-rw-r--r--linux/include/asm-arm/arch-pxa/camera.h2
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;