diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 14:31:12 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 14:31:12 -0200 |
commit | 87a688a17ae8f82d48dd8833ed0eb29ecba1183c (patch) | |
tree | c65044f2d92ddab4fdb8d56bfda831307bde74a8 /linux/drivers/media/dvb/ttpci/av7110_ir.c | |
parent | 09569d7cdf845441f5d37be1a42c1ef0fe84a61d (diff) | |
parent | 1dbbdee4213114f49f8fe0d92a6daeba5c6f639f (diff) | |
download | mediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.gz mediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/tda8295
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_ir.c')
-rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_ir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c index be0fa967d..9097646a3 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ir.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c @@ -27,7 +27,7 @@ #include <linux/module.h> #include <linux/proc_fs.h> #include <linux/kernel.h> -#include <asm/bitops.h> +#include <linux/bitops.h> #include "av7110.h" #include "av7110_hw.h" |