diff options
| author | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /sound/pcmcia/pdaudiocf/pdaudiocf.h | |
| parent | MAINTAINERS: fix sorting (diff) | |
| parent | klist: Fix object alignment on 64-bit. (diff) | |
| download | kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip | |
Merge branch 'master' into for-next
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 @@ #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> |