diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-16 11:46:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-16 11:46:25 -0300 |
| commit | c4a8a2e49ee685a2e77215fc26bda43415a6df1d (patch) | |
| tree | fb2d4db0e782716b3d55f2b13905be571b64e6b1 | |
| parent | 6c113597de81585c471d6e20d802c5ed36bdef9e (diff) | |
| parent | 91ccc2034f8716ede10392bfc5ec63ee611ae90b (diff) | |
| download | mediapointer-dvb-s2-c4a8a2e49ee685a2e77215fc26bda43415a6df1d.tar.gz mediapointer-dvb-s2-c4a8a2e49ee685a2e77215fc26bda43415a6df1d.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>
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 3 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/siano/smscoreapi.h b/linux/drivers/media/dvb/siano/smscoreapi.h index 564f4c0d4..482ef0676 100644 --- a/linux/drivers/media/dvb/siano/smscoreapi.h +++ b/linux/drivers/media/dvb/siano/smscoreapi.h @@ -27,8 +27,9 @@ #include <linux/list.h> #include <linux/mm.h> #include <linux/scatterlist.h> +#include <linux/types.h> #include <asm/page.h> - +#include "compat.h" #include "dmxdev.h" #include "dvbdev.h" #include "dvb_demux.h" diff --git a/v4l/compat.h b/v4l/compat.h index d32806e9b..ba9a7cff7 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -210,4 +210,8 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) +typedef unsigned long uintptr_t; +#endif + #endif |