From: Justin P. Mattock on
This fixes a warning I'm seeing when building:
CC [M] drivers/media/video/gspca/gspca.o
drivers/media/video/gspca/gspca.c: In function 'vidioc_reqbufs':
drivers/media/video/gspca/gspca.c:1508:2: warning: case value '7' not in enumerated type 'enum v4l2_memory'

Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com>

---
drivers/media/video/gspca/gspca.c | 1 -
include/linux/videodev2.h | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 678675b..a9b4d97 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -84,7 +84,6 @@ static void PDEBUG_MODE(char *txt, __u32 pixfmt, int w, int h)

/* specific memory types - !! should be different from V4L2_MEMORY_xxx */
#define GSPCA_MEMORY_NO 0 /* V4L2_MEMORY_xxx starts from 1 */
-#define GSPCA_MEMORY_READ 7

#define BUF_ALL_FLAGS (V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE)

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 047f7e6..b73aa18 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -170,6 +170,7 @@ enum v4l2_memory {
V4L2_MEMORY_MMAP = 1,
V4L2_MEMORY_USERPTR = 2,
V4L2_MEMORY_OVERLAY = 3,
+ GSPCA_MEMORY_READ = 7,
};

/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
--
1.7.1.rc1.21.gf3bd6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: perf fixes
Next: Business Proposal!!!