From e202ecceb8603cc4998a348b5e14449c6704588f Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 2 Feb 2011 17:49:53 +0100
Subject: [PATCH] --- yaml --- r: 232911 b: refs/heads/master c:
 ddfb319926462fd9670b7c1678a1f6a14a68e421 h: refs/heads/master i:   232909:
 c48fe43c9fe419406fe2bcdf333bbe3d961dad9c   232907:
 6c4216ada409d4777ad5a20bc2ac6587b4bc7cc8   232903:
 ea1719078c8f9745fc0f14ff5db4821f3c4b1487   232895:
 5648e13eab641ae2738714f2497e1fc1e2587a6d v: v3

---
 [refs]                                   | 2 +-
 trunk/sound/drivers/mtpav.c              | 3 +--
 trunk/sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 +-
 trunk/sound/pcmcia/vx/vxp_ops.c          | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 89c263348a5c..4e2123f5b532 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f7db11c45a313b23922cacf248c613c3b2144c
+refs/heads/master: ddfb319926462fd9670b7c1678a1f6a14a68e421
diff --git a/trunk/sound/drivers/mtpav.c b/trunk/sound/drivers/mtpav.c
index da03597fc893..5c426df87678 100644
--- a/trunk/sound/drivers/mtpav.c
+++ b/trunk/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
  */
diff --git a/trunk/sound/pcmcia/pdaudiocf/pdaudiocf.h b/trunk/sound/pcmcia/pdaudiocf/pdaudiocf.h
index bd26e092aead..6ce9ad700290 100644
--- a/trunk/sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/trunk/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>
diff --git a/trunk/sound/pcmcia/vx/vxp_ops.c b/trunk/sound/pcmcia/vx/vxp_ops.c
index 989e04abb520..fe33e122e372 100644
--- a/trunk/sound/pcmcia/vx/vxp_ops.c
+++ b/trunk/sound/pcmcia/vx/vxp_ops.c
@@ -23,8 +23,8 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/io.h>
 #include <sound/core.h>
-#include <asm/io.h>
 #include "vxpocket.h"