summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 09:25:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 09:25:04 -0300
commit4bc820a744a300fa8a4fe1adb5f87594f286ea41 (patch)
treeed9ca1205062168996ee1ebae9b5d4b1086564d0 /linux/drivers/media/video/pwc
parente060bd6ae7ce4dee0f07e3ac5051de35b4908bd0 (diff)
parent6dfa16c1aa732ce5a5c0f0404e70ed2d65675b6b (diff)
downloadmediapointer-dvb-s2-4bc820a744a300fa8a4fe1adb5f87594f286ea41.tar.gz
mediapointer-dvb-s2-4bc820a744a300fa8a4fe1adb5f87594f286ea41.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dm646x
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc')
-rw-r--r--linux/drivers/media/video/pwc/pwc.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h
index 3a89dca13..7a766eb35 100644
--- a/linux/drivers/media/video/pwc/pwc.h
+++ b/linux/drivers/media/video/pwc/pwc.h
@@ -137,12 +137,6 @@
#define DEVICE_USE_CODEC3(x) ((x)>=700)
#define DEVICE_USE_CODEC23(x) ((x)>=675)
-
-#ifndef V4L2_PIX_FMT_PWC1
-#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1')
-#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2')
-#endif
-
/* The following structures were based on cpia.h. Why reinvent the wheel? :-) */
struct pwc_iso_buf
{