[media] solo6x10: rename jpeg.h to solo6x10-jpeg.h

This header clashes with the jpeg.h in gspca when doing a compatibility build using the media_build system. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Nov 7, 2011 · b3c7d45 · b3c7d45
1 parent b3f4e1e
commit b3c7d45
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/drivers/staging/media/solo6x10/jpeg.h → ...rs/staging/media/solo6x10/solo6x10-jpeg.h b/drivers/staging/media/solo6x10/jpeg.h → ...rs/staging/media/solo6x10/solo6x10-jpeg.h
diff --git a/drivers/staging/media/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c
@@ -26,7 +26,7 @@
 #include <media/videobuf-dma-sg.h>
 #include "solo6x10.h"
 #include "tw28.h"
-#include "jpeg.h"
+#include "solo6x10-jpeg.h"
 
 #define MIN_VID_BUFFERS		4
 #define FRAME_BUF_SIZE		(128 * 1024)