diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-14 18:53:03 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-14 18:53:03 +0200 |
| commit | 581821974ee84e9e8612635f0d09fba4804d407e (patch) | |
| tree | b4502359bd68a1fc84b8b7dcc69f4f9f0272aa9f /linux/drivers/media/dvb | |
| parent | d9b974a4eeee7a96240f6f917e52c46f61f013f0 (diff) | |
| parent | 9421ca72b55ed6cea1e47552070207878fd925c5 (diff) | |
| download | mediapointer-dvb-s2-581821974ee84e9e8612635f0d09fba4804d407e.tar.gz mediapointer-dvb-s2-581821974ee84e9e8612635f0d09fba4804d407e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 2 |
2 files changed, 2 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" |