summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/stk-webcam.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 23:49:57 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 23:49:57 -0200
commitba7457fc4d28e1b336aaa55c60d3814c310f9fd8 (patch)
treec6e2921c1aa0c11a0f743c01e3fcd42124410138 /linux/drivers/media/video/stk-webcam.h
parent667e11f6005391136bad274d2333240d54b08294 (diff)
parent10b29761e7203ebceee27adfb5d3e92803f2512e (diff)
downloadmediapointer-dvb-s2-ba7457fc4d28e1b336aaa55c60d3814c310f9fd8.tar.gz
mediapointer-dvb-s2-ba7457fc4d28e1b336aaa55c60d3814c310f9fd8.tar.bz2
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/stk-webcam.h')
-rw-r--r--linux/drivers/media/video/stk-webcam.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/stk-webcam.h b/linux/drivers/media/video/stk-webcam.h
index df4dfefc5..084a85bdd 100644
--- a/linux/drivers/media/video/stk-webcam.h
+++ b/linux/drivers/media/video/stk-webcam.h
@@ -99,7 +99,6 @@ struct stk_camera {
u8 isoc_ep;
- struct kref kref;
/* Not sure if this is right */
atomic_t urbs_used;
@@ -121,7 +120,6 @@ struct stk_camera {
unsigned sequence;
};
-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
void stk_camera_delete(struct kref *);