diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-02-16 21:49:31 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-02-16 21:49:31 -0500 |
| commit | 381bcd3aa9c4c844cb415342a0ab21622c596488 (patch) | |
| tree | 75e79ed984e931dc37c254639d99d63d59c4aba6 /linux/drivers/media/video/stk-webcam.h | |
| parent | 7e39be7b7313d51ad3be46803a5918f1b2914b82 (diff) | |
| parent | 18ac0ef62eca3a89e0bf1f3c23bb7004e760d15b (diff) | |
| download | mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.gz mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.bz2 | |
merge: ~stoth/pci-nano
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/stk-webcam.h')
| -rw-r--r-- | linux/drivers/media/video/stk-webcam.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/stk-webcam.h b/linux/drivers/media/video/stk-webcam.h index 7e989d1ac..df4dfefc5 100644 --- a/linux/drivers/media/video/stk-webcam.h +++ b/linux/drivers/media/video/stk-webcam.h @@ -79,6 +79,7 @@ enum stk_status { #define unset_present(dev) ((dev)->status &= \ ~(S_PRESENT|S_INITIALISED|S_STREAMING)) #define set_initialised(dev) ((dev)->status |= S_INITIALISED) +#define unset_initialised(dev) ((dev)->status &= ~S_INITIALISED) #define set_memallocd(dev) ((dev)->status |= S_MEMALLOCD) #define unset_memallocd(dev) ((dev)->status &= ~S_MEMALLOCD) #define set_streaming(dev) ((dev)->status |= S_STREAMING) @@ -127,8 +128,6 @@ void stk_camera_delete(struct kref *); int stk_camera_write_reg(struct stk_camera *, u16, u8); int stk_camera_read_reg(struct stk_camera *, u16, int *); -int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val); -int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val); int stk_sensor_init(struct stk_camera *); int stk_sensor_configure(struct stk_camera *); int stk_sensor_sleep(struct stk_camera *dev); |