git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
bluetooth
/
bluecard_cs.c
diff --git
a/drivers/bluetooth/bluecard_cs.c
b/drivers/bluetooth/bluecard_cs.c
index 6f907ebed2d50064a6c1058828097fca53192099..6d34f405a2f37424976a685c669217bbd17fbca9 100644
(file)
--- a/
drivers/bluetooth/bluecard_cs.c
+++ b/
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>