From 89bf1114e449932e8bfd500e5cb5d1ecbeaee728 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 Nov 2011 08:26:34 -0300
Subject: [PATCH] --- yaml --- r: 285291 b: refs/heads/master c:
 7dbb3920252dcb3662e934b134ccb5129f62cbad h: refs/heads/master i:   285289:
 da3d9a5594697e7eb08f67670ba0ed7a9fdeca75   285287:
 5f0e52da8569dfe530aabcae644638af41a958f7 v: v3

---
 [refs]                                           |  2 +-
 .../drivers/staging/media/easycap/easycap_low.c  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c40ffcb3ab97..4a7cac2a4671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47cefc21ef4ce2c8caec931a2dbe7fef1727fc31
+refs/heads/master: 7dbb3920252dcb3662e934b134ccb5129f62cbad
diff --git a/trunk/drivers/staging/media/easycap/easycap_low.c b/trunk/drivers/staging/media/easycap/easycap_low.c
index 02bb2e5c85a6..ef37de88a6b5 100644
--- a/trunk/drivers/staging/media/easycap/easycap_low.c
+++ b/trunk/drivers/staging/media/easycap/easycap_low.c
@@ -60,9 +60,9 @@
 
 /*--------------------------------------------------------------------------*/
 static const struct stk1160config {
-	int reg;
-	int set;
-} stk1160configPAL[256] = {
+	u16 reg;
+	u16 set;
+} stk1160configPAL[] = {
 		{0x000, 0x0098},
 		{0x002, 0x0093},
 
@@ -104,7 +104,7 @@ static const struct stk1160config {
 		{0xFFF, 0xFFFF}
 };
 /*--------------------------------------------------------------------------*/
-static const struct stk1160config stk1160configNTSC[256] = {
+static const struct stk1160config stk1160configNTSC[] = {
 		{0x000, 0x0098},
 		{0x002, 0x0093},
 
@@ -147,9 +147,9 @@ static const struct stk1160config stk1160configNTSC[256] = {
 };
 /*--------------------------------------------------------------------------*/
 static const struct saa7113config {
-	int reg;
-	int set;
-} saa7113configPAL[256] = {
+	u8 reg;
+	u8 set;
+} saa7113configPAL[] = {
 		{0x01, 0x08},
 		{0x02, 0x80},
 		{0x03, 0x33},
@@ -203,7 +203,7 @@ static const struct saa7113config {
 		{0xFF, 0xFF}
 };
 /*--------------------------------------------------------------------------*/
-static const struct saa7113config saa7113configNTSC[256] = {
+static const struct saa7113config saa7113configNTSC[] = {
 		{0x01, 0x08},
 		{0x02, 0x80},
 		{0x03, 0x33},