diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-12 16:50:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-12 16:50:43 -0300 |
| commit | 9421ca72b55ed6cea1e47552070207878fd925c5 (patch) | |
| tree | e457ecf00749780c30b05d38c1d3386095fe8223 /linux/drivers | |
| parent | f194278d3ad402f9b2a6d45a6e32b2e18053af74 (diff) | |
| parent | 417e3b5fd4fbcd6d9bcbc64d74bdc84176736e52 (diff) | |
| download | mediapointer-dvb-s2-9421ca72b55ed6cea1e47552070207878fd925c5.tar.gz mediapointer-dvb-s2-9421ca72b55ed6cea1e47552070207878fd925c5.tar.bz2 | |
merge: http://linuxtv.org/hg/~hgoede/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 3 |
3 files changed, 5 insertions, 2 deletions
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" 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 */ |