summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-01-30 11:34:06 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:05:05 +0200
commit08feb8c1a09bd7db7efe92833eca38db2f2e3357 (patch)
treef75a13545c0b558a08bf1a5d236f0a129d95bfa2 /sound
parent5d0e9441baac2163732e68bee502e2c5f770a903 (diff)
sound: Fix after includes renaming in 3.3
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ab8500_audio.c3
-rw-r--r--sound/soc/ux500/ux500_ab8500.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c
index 0741b5aa6ff..d51e3a7a544 100644
--- a/sound/soc/codecs/ab8500_audio.c
+++ b/sound/soc/codecs/ab8500_audio.c
@@ -31,10 +31,9 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/tlv.h>
-#include <linux/mfd/ab8500.h>
#include <linux/mfd/abx500.h>
#include <linux/mfd/abx500/ab5500.h>
-#include <linux/mfd/ab8500/sysctrl.h>
+#include <linux/mfd/abx500/ab8500-sysctrl.h>
#include "ab8500_audio.h"
/* To convert register definition shifts to masks */
diff --git a/sound/soc/ux500/ux500_ab8500.c b/sound/soc/ux500/ux500_ab8500.c
index 710843e9072..452564f3e5c 100644
--- a/sound/soc/ux500/ux500_ab8500.c
+++ b/sound/soc/ux500/ux500_ab8500.c
@@ -22,7 +22,7 @@
#include <linux/device.h>
#include <linux/io.h>
#include <linux/regulator/consumer.h>
-#include <linux/mfd/ab8500/gpadc.h>
+#include <linux/mfd/abx500/ab8500-gpadc.h>
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/pcm.h>