Commit b3c7d453 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b3f4e1eb

drivers/staging/media/solo6x10/v4l2-enc.c

+1 −1
Original line number Diff line number Diff line
@@ -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)