summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/n810.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 10:47:46 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 10:47:46 +0000
commit41966710ab574f1fcedf3e10e1ceef911c096d1d (patch)
treea370f9fb2392267d1e7b06d7c9f43c6d80eb12be /sound/soc/omap/n810.c
parent4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff)
parent1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff)
downloadlinux-41966710ab574f1fcedf3e10e1ceef911c096d1d.tar.gz
linux-41966710ab574f1fcedf3e10e1ceef911c096d1d.tar.bz2
linux-41966710ab574f1fcedf3e10e1ceef911c096d1d.zip
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/omap/n810.c')
-rw-r--r--sound/soc/omap/n810.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 7e3c20c965c6..fc6209b3f20c 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -31,6 +31,7 @@
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <linux/gpio.h>
+#include <linux/module.h>
#include <plat/mcbsp.h>
#include "omap-mcbsp.h"