git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/azt3328' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
stv06xx
/
stv06xx.h
diff --git
a/drivers/media/video/gspca/stv06xx/stv06xx.h
b/drivers/media/video/gspca/stv06xx/stv06xx.h
index
9df7137
..
992ce53
100644
(file)
--- a/
drivers/media/video/gspca/stv06xx/stv06xx.h
+++ b/
drivers/media/video/gspca/stv06xx/stv06xx.h
@@
-36,10
+36,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 */