diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 19:08:55 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 19:08:55 -0300 |
commit | 784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b (patch) | |
tree | faa5f190e79e79c18b4d56c6fa643e6f251e4563 /linux/drivers/media/video/pwc/pwc.h | |
parent | 33059960a17b83a720e88a4093d4fc40a1a307a4 (diff) | |
parent | 59ad1e534e569f743df108421f369cbf915f2e6e (diff) | |
download | mediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.gz mediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/ivtv
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
-rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 6 |
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 { |