From c78be90d3f223f67d7177af1c67e013daa8645ad Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 6 Dec 2011 11:01:38 +0000
Subject: [PATCH] --- yaml --- r: 283892 b: refs/heads/master c:
 21abbb024fb782f176d7e9ddd3bef8207d024227 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/Kconfig  | 2 +-
 trunk/sound/soc/codecs/jz4740.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e0d9e2b0ed1..765ef465c939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6664ee115bb45d912d64d1c6b26bd3b96ef7df09
+refs/heads/master: 21abbb024fb782f176d7e9ddd3bef8207d024227
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index bc2364aced1b..7c205e77d83a 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_CX20442
 	select SND_SOC_DA7210 if I2C
 	select SND_SOC_DFBMCS320
-	select SND_SOC_JZ4740_CODEC if SOC_JZ4740
+	select SND_SOC_JZ4740_CODEC
 	select SND_SOC_LM4857 if I2C
 	select SND_SOC_MAX98088 if I2C
 	select SND_SOC_MAX98095 if I2C
diff --git a/trunk/sound/soc/codecs/jz4740.c b/trunk/sound/soc/codecs/jz4740.c
index 517e2a516daf..d73d28317c00 100644
--- a/trunk/sound/soc/codecs/jz4740.c
+++ b/trunk/sound/soc/codecs/jz4740.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <linux/delay.h>