[media] solo6x10: rename headers

Prefix the headers with 'solo6x10-'.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c
index 779d4b43aaa5fb3f5b6f38997226a04040322af7..36750205d23fbc507a6c0fa68f9c99eb5370cd4b 100644 (file)
--- 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 183222e7ee95cfc5dcdf3d59661fd3a4eabf8256..1db18c7972a00cfc6db7c94d824f1e7b03676d4c 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/media/solo6x10/offsets.h
rename to drivers/staging/media/solo6x10/solo6x10-offsets.h

diff --git a/drivers/staging/media/solo6x10/registers.h b/drivers/staging/media/solo6x10/solo6x10-regs.h
similarity index 99%
rename from drivers/staging/media/solo6x10/registers.h
rename to drivers/staging/media/solo6x10/solo6x10-regs.h
index 5e5c7e6b43bfe3610e30b1c4649a8e6478e1b722..428f6c951180c84b125253347b44d6c469a2c14a 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/media/solo6x10/tw28.h
rename to drivers/staging/media/solo6x10/solo6x10-tw28.h

diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
index da7611ea0e7e693036d3fadf83cc3a1df6498b35..3526d6b56c5c075e99a3a3a5951bcbb85b3fe075 100644 (file)
--- 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 6c77af8259b39d91315ee680c8b7171cad8b0cc2..ad00e2b6032380b26843e6b24c29e676a43b7bac 100644 (file)
--- 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 b1fa78b2eaff4f5cc2dc8b016137dbba26858c12..39a8fb2802e425576d4f09cf4e2138113450f8aa 100644 (file)
--- 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 02749a3c1d8faacbd7b0e1847f766fc4527bb492..7b26de3488da16d3f70bb99079ccc3d5a80af98f 100644 (file)
--- 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