From 08feb8c1a09bd7db7efe92833eca38db2f2e3357 Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@stericsson.com>
Date: Mon, 30 Jan 2012 11:34:06 +0100
Subject: sound: Fix after includes renaming in 3.3

Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
---
 include/sound/ux500_ab8500_ext.h | 2 +-
 sound/soc/codecs/ab8500_audio.c  | 3 +--
 sound/soc/ux500/ux500_ab8500.c   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/sound/ux500_ab8500_ext.h b/include/sound/ux500_ab8500_ext.h
index 1170fa3a6f5..1cc9a74585c 100644
--- a/include/sound/ux500_ab8500_ext.h
+++ b/include/sound/ux500_ab8500_ext.h
@@ -14,7 +14,7 @@
 #ifndef UX500_AB8500_EXT_H
 #define UX500_AB8500_EXT_H
 
-#include <linux/mfd/ab8500/gpadc.h>
+#include <linux/mfd/abx500/ab8500-gpadc.h>
 
 int ux500_ab8500_audio_gpadc_measure(struct ab8500_gpadc *gpadc,
 			u8 channel, bool mode, int *value);
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>
-- 
cgit v1.2.3