diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /sound/pcmcia/pdaudiocf/pdaudiocf.h | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.h')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index bd26e092aead..6ce9ad700290 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define __PDAUDIOCF_H | 22 | #define __PDAUDIOCF_H |
| 23 | 23 | ||
| 24 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
| 25 | #include <asm/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <pcmcia/cistpl.h> | 27 | #include <pcmcia/cistpl.h> |
| 28 | #include <pcmcia/ds.h> | 28 | #include <pcmcia/ds.h> |