summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/jz4740.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-06 11:01:38 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-06 11:01:38 +0000
commit21abbb024fb782f176d7e9ddd3bef8207d024227 (patch)
tree706237be9d5c2d908408622851edfc1f63ab144f /sound/soc/codecs/jz4740.c
parent6664ee115bb45d912d64d1c6b26bd3b96ef7df09 (diff)
parentf8f626f537aee0da878d287e0d7694b7b76d599a (diff)
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/jz4740.c')
-rw-r--r--sound/soc/codecs/jz4740.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index 517e2a516daf..d73d28317c00 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/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>