From 0c8c6038ee2ac34731abbc06058417ddf13596bc Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Fri, 11 Jul 2008 20:37:08 -0400
Subject: sms1xxx: fix improper usage of asm/foo.h

From: Michael Krufky <mkrufky@linuxtv.org>

Fix the following warnings generated by checkpatch.pl:

WARNING: Use #include <linux/io.h> instead of <asm/io.h>
 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30:
+#include <asm/io.h>

WARNING: Use #include <linux/scatterlist.h> instead of <asm/scatterlist.h>
 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29:
+#include <asm/scatterlist.h>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/dvb/siano/smscoreapi.c | 2 +-
 linux/drivers/media/dvb/siano/smscoreapi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/dvb/siano/smscoreapi.c b/linux/drivers/media/dvb/siano/smscoreapi.c
index 549332b53..d8c7304b2 100644
--- a/linux/drivers/media/dvb/siano/smscoreapi.c
+++ b/linux/drivers/media/dvb/siano/smscoreapi.c
@@ -27,7 +27,7 @@
 #include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/firmware.h>
 
diff --git a/linux/drivers/media/dvb/siano/smscoreapi.h b/linux/drivers/media/dvb/siano/smscoreapi.h
index d49bd5012..564f4c0d4 100644
--- a/linux/drivers/media/dvb/siano/smscoreapi.h
+++ b/linux/drivers/media/dvb/siano/smscoreapi.h
@@ -26,7 +26,7 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <asm/page.h>
 
 #include "dmxdev.h"
-- 
cgit v1.2.3


From 1256e66660d3ac435768ff432e02a5fa45c572cb Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 12 Jul 2008 10:24:29 -0300
Subject: saa7134: fix compilation

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Previous patch added a macro that it is not yet defined. Disable that part of
the code for now.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 linux/drivers/media/video/saa7134/saa7134-cards.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux')

diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 0d4dca518..08597a558 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -6078,6 +6078,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
 		i2c_transfer(&dev->i2c_adap, &msg, 1);
 		break;
 	}
+#if 0
+	/* FIXME: This entry doesn't exist yet */
        case SAA7134_BOARD_ASUSTeK_TVFM35:
        /* The card below is detected as card=53, but is different */
 	       if (dev->autodetected && (dev->eedata[0x27] == 0x03)) {
@@ -6087,6 +6089,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
 		       dev->name, saa7134_boards[dev->board].name);
 	       }
 	       break;
+#endif
 	case SAA7134_BOARD_HAUPPAUGE_HVR1110:
 		hauppauge_eeprom(dev, dev->eedata+0x80);
 		/* break intentionally omitted */
-- 
cgit v1.2.3