summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/zl10036.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-24 16:06:02 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-24 16:06:02 -0300
commitdeefc0915f10e253d00f4bdf034bfa4bae57c47e (patch)
tree8ff0be0a9e2a0d6a8c7d3cfd5695e4bbb1998277 /linux/drivers/media/dvb/frontends/zl10036.c
parentf32c3e119058285fb6ceadc44d235717e45c7d5c (diff)
parent9eeecdeb0316860051424e4fa4fe315c10fcc0ad (diff)
downloadmediapointer-dvb-s2-deefc0915f10e253d00f4bdf034bfa4bae57c47e.tar.gz
mediapointer-dvb-s2-deefc0915f10e253d00f4bdf034bfa4bae57c47e.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/zl10036.c')
-rw-r--r--linux/drivers/media/dvb/frontends/zl10036.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/zl10036.c b/linux/drivers/media/dvb/frontends/zl10036.c
index 67cdb056f..ce2a2703b 100644
--- a/linux/drivers/media/dvb/frontends/zl10036.c
+++ b/linux/drivers/media/dvb/frontends/zl10036.c
@@ -29,7 +29,7 @@
#include <linux/module.h>
#include <linux/dvb/frontend.h>
-#include <asm/types.h>
+#include <linux/types.h>
#include "compat.h"
#include "zl10036.h"