From 169198fa63eb6dc45466018fd347bb01e08aabf2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Mon, 2 Apr 2012 10:24:08 +0200
Subject: [PATCH] --- yaml --- r: 298943 b: refs/heads/master c:
 e95cee0e36c671db2804f2763b547a86930061ea h: refs/heads/master i:   298941:
 aa68fddcf31a0a054b2014efba10a0e8872a4acb   298939:
 10a4394db429f293aa8dc6f7941e1ed8d63bad4b   298935:
 27684fd81d5852d1ba4a0950577dae18da90c26b   298927:
 431aae605cbf631d99b69ea752c25cdec2d33269   298911:
 84a4b4c3d73649ee3b1052b1cc11aae51a0d6b92   298879:
 9da4e05cb182941a9d90e8ef31b226a8fe1f8c96 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/pxa/pxa2xx-i2s.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 69367fa9847b..c3439e67fb81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd1506736f3a77429f619ede817a119a7ff5f7e5
+refs/heads/master: e95cee0e36c671db2804f2763b547a86930061ea
diff --git a/trunk/sound/soc/pxa/pxa2xx-i2s.c b/trunk/sound/soc/pxa/pxa2xx-i2s.c
index 609abd51e55f..d08583790d23 100644
--- a/trunk/sound/soc/pxa/pxa2xx-i2s.c
+++ b/trunk/sound/soc/pxa/pxa2xx-i2s.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>