summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 19:08:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 19:08:55 -0300
commit784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b (patch)
treefaa5f190e79e79c18b4d56c6fa643e6f251e4563 /linux/drivers/media/video/gspca
parent33059960a17b83a720e88a4093d4fc40a1a307a4 (diff)
parent59ad1e534e569f743df108421f369cbf915f2e6e (diff)
downloadmediapointer-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/gspca')
-rw-r--r--linux/drivers/media/video/gspca/stv06xx/stv06xx.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/stv06xx/stv06xx.h b/linux/drivers/media/video/gspca/stv06xx/stv06xx.h
index bb73c3288..bdea4dae2 100644
--- a/linux/drivers/media/video/gspca/stv06xx/stv06xx.h
+++ b/linux/drivers/media/video/gspca/stv06xx/stv06xx.h
@@ -37,10 +37,6 @@
#define STV_ISOC_ENDPOINT_ADDR 0x81
-#ifndef V4L2_PIX_FMT_SGRBG8
-#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G')
-#endif
-
#define STV_REG23 0x0423
/* Control registers of the STV0600 ASIC */