From 8dd12179bf7e5238d6e5be9970ef6663a18d1530 Mon Sep 17 00:00:00 2001
From: Cody Rester <codyrester@gmail.com>
Date: Thu, 1 Jul 2010 21:27:44 -0700
Subject: [PATCH] --- yaml --- r: 200871 b: refs/heads/master c:
 c89827e0e9346c039aed9b63c14096c2d36796b1 h: refs/heads/master i:   200869:
 4bad047b895380c69708d2c18fe517d125773362   200867:
 1281b8f28a042dc073084d5bdc7e550c475c977c   200863:
 177266c0d1bff3d3966690b1151c55533a1f4229 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/bluetooth/bluecard_cs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4146d8a40ccb..1aac99b7a8ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42d782ac1bef7cbcdf05b857731345c6e8149f90
+refs/heads/master: c89827e0e9346c039aed9b63c14096c2d36796b1
diff --git a/trunk/drivers/bluetooth/bluecard_cs.c b/trunk/drivers/bluetooth/bluecard_cs.c
index 6f907ebed2d5..6d34f405a2f3 100644
--- a/trunk/drivers/bluetooth/bluecard_cs.c
+++ b/trunk/drivers/bluetooth/bluecard_cs.c
@@ -37,7 +37,7 @@
 #include <linux/wait.h>
 
 #include <linux/skbuff.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>