git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
sound
/
pcmcia
/
pdaudiocf
/
pdaudiocf.h
diff --git
a/sound/pcmcia/pdaudiocf/pdaudiocf.h
b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index
bd26e09
..
6ce9ad7
100644
(file)
--- a/
sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/
sound/pcmcia/pdaudiocf/pdaudiocf.h
@@
-22,7
+22,7
@@
#define __PDAUDIOCF_H
#include <sound/pcm.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <linux/interrupt.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>