From 8b0a20925cc7a1ae526615efb98092a7fd38de74 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 25 Mar 2013 05:42:46 -0300
Subject: [PATCH] --- yaml --- r: 366845 b: refs/heads/master c:
 dad7fab933622ee67774a9219d5c18040d97a5e5 h: refs/heads/master i:   366843:
 cf54da04a403124c5faa465ff40adcabd01a1028 v: v3

---
 [refs]                                                          | 2 +-
 trunk/drivers/staging/media/solo6x10/core.c                     | 2 +-
 trunk/drivers/staging/media/solo6x10/g723.c                     | 2 +-
 .../staging/media/solo6x10/{offsets.h => solo6x10-offsets.h}    | 0
 .../staging/media/solo6x10/{registers.h => solo6x10-regs.h}     | 2 +-
 .../drivers/staging/media/solo6x10/{tw28.h => solo6x10-tw28.h}  | 0
 trunk/drivers/staging/media/solo6x10/solo6x10.h                 | 2 +-
 trunk/drivers/staging/media/solo6x10/tw28.c                     | 2 +-
 trunk/drivers/staging/media/solo6x10/v4l2-enc.c                 | 2 +-
 trunk/drivers/staging/media/solo6x10/v4l2.c                     | 2 +-
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/drivers/staging/media/solo6x10/{offsets.h => solo6x10-offsets.h} (100%)
 rename trunk/drivers/staging/media/solo6x10/{registers.h => solo6x10-regs.h} (99%)
 rename trunk/drivers/staging/media/solo6x10/{tw28.h => solo6x10-tw28.h} (100%)

diff --git a/[refs] b/[refs]
index 54da368163bb..436113ceeb1b 100644
--- 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
index 779d4b43aaa5..36750205d23f 100644
--- 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
index 183222e7ee95..1db18c7972a0 100644
--- 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/trunk/drivers/staging/media/solo6x10/offsets.h b/trunk/drivers/staging/media/solo6x10/solo6x10-offsets.h
similarity index 100%
rename from trunk/drivers/staging/media/solo6x10/offsets.h
rename to trunk/drivers/staging/media/solo6x10/solo6x10-offsets.h
diff --git a/trunk/drivers/staging/media/solo6x10/registers.h b/trunk/drivers/staging/media/solo6x10/solo6x10-regs.h
similarity index 99%
rename from trunk/drivers/staging/media/solo6x10/registers.h
rename to trunk/drivers/staging/media/solo6x10/solo6x10-regs.h
index 5e5c7e6b43bf..428f6c951180 100644
--- a/trunk/drivers/staging/media/solo6x10/registers.h
+++ b/trunk/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/trunk/drivers/staging/media/solo6x10/tw28.h b/trunk/drivers/staging/media/solo6x10/solo6x10-tw28.h
similarity index 100%
rename from trunk/drivers/staging/media/solo6x10/tw28.h
rename to trunk/drivers/staging/media/solo6x10/solo6x10-tw28.h
diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h
index da7611ea0e7e..3526d6b56c5c 100644
--- 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
index 6c77af8259b3..ad00e2b60323 100644
--- 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
index b1fa78b2eaff..39a8fb2802e4 100644
--- 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
index 02749a3c1d8f..7b26de3488da 100644
--- 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