diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-11-03 06:57:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-07 09:54:29 -0200 |
| commit | b3c7d453a00b7dadc2a7435f68b012371ccc3a3e (patch) | |
| tree | 6b4da76be10d4a37f75f1356b92b23fb4fb867ec | |
| parent | b3f4e1eba45eda5d1213810ef3bc53e5247df2df (diff) | |
| download | talos-op-linux-b3c7d453a00b7dadc2a7435f68b012371ccc3a3e.tar.gz talos-op-linux-b3c7d453a00b7dadc2a7435f68b012371ccc3a3e.zip | |
[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>
| -rw-r--r-- | drivers/staging/media/solo6x10/solo6x10-jpeg.h (renamed from drivers/staging/media/solo6x10/jpeg.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/v4l2-enc.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/jpeg.h b/drivers/staging/media/solo6x10/solo6x10-jpeg.h index 50defec318cc..50defec318cc 100644 --- a/drivers/staging/media/solo6x10/jpeg.h +++ b/drivers/staging/media/solo6x10/solo6x10-jpeg.h diff --git a/drivers/staging/media/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c index bee7280bbed9..f8f0da952288 100644 --- 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) |
