From 84b436361be913eea8cd4760fc376e8bd208815f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 3 Jul 2011 19:00:32 -0300
Subject: [PATCH] --- yaml --- r: 261500 b: refs/heads/master c:
 28d45a5d294e3f2beddd355b41fa50a66df726cc h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/dvb/ddbridge/ddbridge-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1894ca8e4fec..8d5c66b7c2d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 805e68743460dd48971d5df2707eb445d980874c
+refs/heads/master: 28d45a5d294e3f2beddd355b41fa50a66df726cc
diff --git a/trunk/drivers/media/dvb/ddbridge/ddbridge-core.c b/trunk/drivers/media/dvb/ddbridge/ddbridge-core.c
index 713fba442d4a..def03d482dc0 100644
--- a/trunk/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/trunk/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -27,7 +27,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/timer.h>