openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Hans Verkuil 2011-11-03 06:57:08 -03:00 committed by Mauro Carvalho Chehab
parent b3f4e1eba4
commit b3c7d453a0
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -26,7 +26,7 @@
#include <media/videobuf-dma-sg.h> #include <media/videobuf-dma-sg.h>
#include "solo6x10.h" #include "solo6x10.h"
#include "tw28.h" #include "tw28.h"
#include "jpeg.h" #include "solo6x10-jpeg.h"
#define MIN_VID_BUFFERS 4 #define MIN_VID_BUFFERS 4
#define FRAME_BUF_SIZE (128 * 1024) #define FRAME_BUF_SIZE (128 * 1024)