summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/rx51.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:29 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:29 +0100
commit5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch)
treec0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /sound/soc/omap/rx51.c
parent423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff)
parentd486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff)
downloadlinux-5561f17f2629cdacf5bc43e0f839ca6434db2c20.tar.bz2
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound/soc/omap/rx51.c')
-rw-r--r--sound/soc/omap/rx51.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 3cd525748975..249cd230ad8f 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -37,7 +37,6 @@
#include <asm/mach-types.h>
#include "omap-mcbsp.h"
-#include "omap-pcm.h"
#define RX51_TVOUT_SEL_GPIO 40
#define RX51_JACK_DETECT_GPIO 177