---

yaml --- r: 366845 b: refs/heads/master c: dad7fab h: refs/heads/master i: 366843: cf54da0 v: v3
git-mirror · Mar 25, 2013 · 8b0a209 · 8b0a209
1 parent 9190550
commit 8b0a209
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5df0b7ff57732f938373f49e89ca219d4717836
+refs/heads/master: dad7fab933622ee67774a9219d5c18040d97a5e5
diff --git a/trunk/drivers/staging/media/solo6x10/core.c b/trunk/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/trunk/drivers/staging/media/solo6x10/g723.c b/trunk/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 → ...staging/media/solo6x10/solo6x10-offsets.h b/.../drivers/staging/media/solo6x10/offsets.h → ...staging/media/solo6x10/solo6x10-offsets.h
diff --git a/...rivers/staging/media/solo6x10/registers.h → ...rs/staging/media/solo6x10/solo6x10-regs.h b/...rivers/staging/media/solo6x10/registers.h → ...rs/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/trunk/drivers/staging/media/solo6x10/tw28.h → ...rs/staging/media/solo6x10/solo6x10-tw28.h b/trunk/drivers/staging/media/solo6x10/tw28.h → ...rs/staging/media/solo6x10/solo6x10-tw28.h
diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/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/trunk/drivers/staging/media/solo6x10/tw28.c b/trunk/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/trunk/drivers/staging/media/solo6x10/v4l2-enc.c b/trunk/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/trunk/drivers/staging/media/solo6x10/v4l2.c b/trunk/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