Merge branch 'for-3.2' into for-3.3

[karo-tx-linux.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 52db96636290372b40ddffaf15f6888bdbcc67b1..6c5ebd38c1b0f050f515dbb2dc1c47acaafc1ba4 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <trace/events/asoc.h>
 
 /**