summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
authorHolger Waechtler <devnull@localhost>2003-03-21 15:09:54 +0000
committerHolger Waechtler <devnull@localhost>2003-03-21 15:09:54 +0000
commit8c45d92457f59a0fbf9cfdeb5f93c412ad524812 (patch)
tree78579bdfe1191e09637f39cea1229b3f48a27988 /linux/drivers/media/dvb/ttpci
parent5673904df7d5dd00df35988fd6fda922b4000398 (diff)
downloadmediapointer-dvb-s2-8c45d92457f59a0fbf9cfdeb5f93c412ad524812.tar.gz
mediapointer-dvb-s2-8c45d92457f59a0fbf9cfdeb5f93c412ad524812.tar.bz2
many more portability changes
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110_ipack.c5
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-av.c1
-rw-r--r--linux/drivers/media/dvb/ttpci/budget.c1
-rw-r--r--linux/drivers/media/dvb/ttpci/budget.h4
4 files changed, 7 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ipack.c b/linux/drivers/media/dvb/ttpci/av7110_ipack.c
index 75f0ea8fb..c8a071fb3 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ipack.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ipack.c
@@ -22,7 +22,7 @@ void av7110_ipack_reset(ipack *p)
void av7110_ipack_init(ipack *p, int size,
void (*func)(u8 *buf, int size, void *priv))
{
- if ( !(p->buf = vmalloc(size*sizeof(u8))) ){
+ if ( !(p->buf = kmalloc(size*sizeof(u8), GFP_KERNEL)) ){
printk ("Couldn't allocate memory for ipack\n");
}
p->size = size;
@@ -34,7 +34,8 @@ void av7110_ipack_init(ipack *p, int size,
void av7110_ipack_free(ipack * p)
{
- if (p->buf) vfree(p->buf);
+ if (p->buf)
+ kfree(p->buf);
}
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index 2fa7ab6aa..95aa2fcc1 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -30,6 +30,7 @@
* the project's page is at http://www.linuxtv.org/dvb/
*/
+#include "compat.h"
#include "budget.h"
#include <media/saa7146_vv.h>
diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c
index d4f9f7640..3188406f7 100644
--- a/linux/drivers/media/dvb/ttpci/budget.c
+++ b/linux/drivers/media/dvb/ttpci/budget.c
@@ -29,6 +29,7 @@
* the project's page is at http://www.linuxtv.org/dvb/
*/
+#include "compat.h"
#include "budget.h"
diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index a76cc607b..1aaae11c6 100644
--- a/linux/drivers/media/dvb/ttpci/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h
@@ -1,6 +1,8 @@
#ifndef __BUDGET_DVB__
#define __BUDGET_DVB__
+#include <media/saa7146.h>
+
#include "dvb_i2c.h"
#include "dvb_frontend.h"
#include "dvbdev.h"
@@ -10,8 +12,6 @@
#include "dvb_filter.h"
#include "dvb_net.h"
-#include <media/saa7146.h>
-
extern int budget_debug;
struct budget_info {