diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/solo6x10/core.c | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/g723.c | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10-offsets.h (renamed from drivers/staging/media/solo6x10/offsets.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10-regs.h (renamed from drivers/staging/media/solo6x10/registers.h) | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10-tw28.h (renamed from drivers/staging/media/solo6x10/tw28.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10.h | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/tw28.c | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/v4l2-enc.c | 2 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/v4l2.c | 2 |
9 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c index 779d4b43aaa..36750205d23 100644 --- a/drivers/staging/media/solo6x10/core.c +++ b/drivers/staging/media/solo6x10/core.c @@ -33,7 +33,7 @@ #include <linux/slab.h> #include "solo6x10.h" -#include "tw28.h" +#include "solo6x10-tw28.h" MODULE_DESCRIPTION("Softlogic 6x10 MPEG4/H.264/G.723 CODEC V4L2/ALSA Driver"); MODULE_AUTHOR("Bluecherry <maintainers@bluecherrydvr.com>"); diff --git a/drivers/staging/media/solo6x10/g723.c b/drivers/staging/media/solo6x10/g723.c index 183222e7ee9..1db18c7972a 100644 --- a/drivers/staging/media/solo6x10/g723.c +++ b/drivers/staging/media/solo6x10/g723.c @@ -36,7 +36,7 @@ #include <sound/control.h> #include "solo6x10.h" -#include "tw28.h" +#include "solo6x10-tw28.h" #define G723_FDMA_PAGES 32 #define G723_PERIOD_BYTES 48 diff --git a/drivers/staging/media/solo6x10/offsets.h b/drivers/staging/media/solo6x10/solo6x10-offsets.h index f005dca501f..f005dca501f 100644 --- a/drivers/staging/media/solo6x10/offsets.h +++ b/drivers/staging/media/solo6x10/solo6x10-offsets.h diff --git a/drivers/staging/media/solo6x10/registers.h b/drivers/staging/media/solo6x10/solo6x10-regs.h index 5e5c7e6b43b..428f6c95118 100644 --- a/drivers/staging/media/solo6x10/registers.h +++ b/drivers/staging/media/solo6x10/solo6x10-regs.h @@ -25,7 +25,7 @@ #ifndef __SOLO6X10_REGISTERS_H #define __SOLO6X10_REGISTERS_H -#include "offsets.h" +#include "solo6x10-offsets.h" /* Global 6010 system configuration */ #define SOLO_SYS_CFG 0x0000 diff --git a/drivers/staging/media/solo6x10/tw28.h b/drivers/staging/media/solo6x10/solo6x10-tw28.h index 1a02c87d4cf..1a02c87d4cf 100644 --- a/drivers/staging/media/solo6x10/tw28.h +++ b/drivers/staging/media/solo6x10/solo6x10-tw28.h diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h index da7611ea0e7..3526d6b56c5 100644 --- a/drivers/staging/media/solo6x10/solo6x10.h +++ b/drivers/staging/media/solo6x10/solo6x10.h @@ -41,7 +41,7 @@ #include <media/v4l2-ctrls.h> #include <media/videobuf2-core.h> -#include "registers.h" +#include "solo6x10-regs.h" #ifndef PCI_VENDOR_ID_SOFTLOGIC #define PCI_VENDOR_ID_SOFTLOGIC 0x9413 diff --git a/drivers/staging/media/solo6x10/tw28.c b/drivers/staging/media/solo6x10/tw28.c index 6c77af8259b..ad00e2b6032 100644 --- a/drivers/staging/media/solo6x10/tw28.c +++ b/drivers/staging/media/solo6x10/tw28.c @@ -26,7 +26,7 @@ #include <linux/delay.h> #include "solo6x10.h" -#include "tw28.h" +#include "solo6x10-tw28.h" #define DEFAULT_HDELAY_NTSC (32 - 8) #define DEFAULT_HACTIVE_NTSC (720 + 16) diff --git a/drivers/staging/media/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c index b1fa78b2eaf..39a8fb2802e 100644 --- a/drivers/staging/media/solo6x10/v4l2-enc.c +++ b/drivers/staging/media/solo6x10/v4l2-enc.c @@ -33,7 +33,7 @@ #include <media/videobuf2-dma-sg.h> #include "solo6x10.h" -#include "tw28.h" +#include "solo6x10-tw28.h" #include "solo6x10-jpeg.h" #define MIN_VID_BUFFERS 2 diff --git a/drivers/staging/media/solo6x10/v4l2.c b/drivers/staging/media/solo6x10/v4l2.c index 02749a3c1d8..7b26de3488d 100644 --- a/drivers/staging/media/solo6x10/v4l2.c +++ b/drivers/staging/media/solo6x10/v4l2.c @@ -33,7 +33,7 @@ #include <media/videobuf2-dma-contig.h> #include "solo6x10.h" -#include "tw28.h" +#include "solo6x10-tw28.h" /* Image size is two fields, SOLO_HW_BPL is one horizontal line in hardware */ #define SOLO_HW_BPL 2048 |