Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[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>
Hans Verkuil 13 years ago
parent
b3f4e1eba4
commit
b3c7d453a0
2 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 0 0
      drivers/staging/media/solo6x10/solo6x10-jpeg.h
  2. 1 1
      drivers/staging/media/solo6x10/v4l2-enc.c

+ 0 - 0
drivers/staging/media/solo6x10/jpeg.h → drivers/staging/media/solo6x10/solo6x10-jpeg.h
View File


+ 1 - 1
drivers/staging/media/solo6x10/v4l2-enc.c
View File 

@@ -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)