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/drivers/mtpav.c | |
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/drivers/mtpav.c')
-rw-r--r-- | sound/drivers/mtpav.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index da03597fc893..5c426df87678 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -55,14 +55,13 @@ #include <linux/err.h> #include <linux/platform_device.h> #include <linux/ioport.h> +#include <linux/io.h> #include <linux/moduleparam.h> #include <sound/core.h> #include <sound/initval.h> #include <sound/rawmidi.h> #include <linux/delay.h> -#include <asm/io.h> - /* * globals */ |