summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRob Herring <r.herring@freescale.com>2009-02-16 15:39:37 -0600
committerRob Herring <r.herring@freescale.com>2009-02-17 15:20:36 -0600
commit9ce9b8eccf0e00e0de86c3f8b97c62b871c8517a (patch)
treed1998f6e22261b6cfe36697c6bf044e1686bd387 /sound
parent3f0b29d708538377cc8353bd6df3703c12c60d11 (diff)
ENGR00107392 Move asm/arch headers to linux inc dir
Architecture specific headers moved and are not accessible to userspace in 2.6.28. So they are moved to linux include directory. Signed-off-by: Rob Herring <r.herring@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/mxc-alsa-pmic.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/sound/arm/mxc-alsa-pmic.c b/sound/arm/mxc-alsa-pmic.c
index 07f9f0fe581f..be824ef0f4c8 100644
--- a/sound/arm/mxc-alsa-pmic.c
+++ b/sound/arm/mxc-alsa-pmic.c
@@ -44,28 +44,25 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <linux/soundcard.h>
-
-#ifdef CONFIG_PM
+#include <linux/pmic_external.h>
#include <linux/pm.h>
-#endif /* CONFIG_PM */
+#include <linux/fs.h>
+#include <linux/clk.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <mach/pmic_audio.h>
#include <mach/dma.h>
#include <asm/mach-types.h>
#include <ssi/ssi.h>
#include <ssi/registers.h>
#include <dam/dam.h>
-#include <mach/pmic_external.h>
-#include <mach/pmic_audio.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-#include <sound/control.h>
#include "mxc-alsa-pmic.h"
#include "mxc-alsa-common.h"
-#include <linux/fs.h>
-#include <linux/clk.h>
/*
* PMIC driver buffer policy.