Re-align headers for AOSP building
Change-Id: I98bd35c4d05210165150d71d77cc94029ad2f449
diff --git a/arch/arm/mach-msm/board-doubleshot-audio-data.h b/arch/arm/mach-msm/board-doubleshot-audio-data.h
index 2eb2a68..23c6e7e 100644
--- a/arch/arm/mach-msm/board-doubleshot-audio-data.h
+++ b/arch/arm/mach-msm/board-doubleshot-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-doubleshot-audio.c b/arch/arm/mach-msm/board-doubleshot-audio.c
index 71f64ab..5851454 100644
--- a/arch/arm/mach-msm/board-doubleshot-audio.c
+++ b/arch/arm/mach-msm/board-doubleshot-audio.c
@@ -18,11 +18,11 @@
#include <linux/mfd/marimba.h>
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/gpio.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v3/snddev_icodec.h>
#include <mach/qdsp6v3/snddev_ecodec.h>
#include <mach/qdsp6v3/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-doubleshot.c b/arch/arm/mach-msm/board-doubleshot.c
index 5e5f088..e04589b 100644
--- a/arch/arm/mach-msm/board-doubleshot.c
+++ b/arch/arm/mach-msm/board-doubleshot.c
@@ -110,7 +110,7 @@
#include <linux/i2c/isl9519.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android_composite.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/usbdiag.h>
#endif
#include <linux/regulator/consumer.h>
diff --git a/arch/arm/mach-msm/board-holiday-audio-data.h b/arch/arm/mach-msm/board-holiday-audio-data.h
index 42c855d..e365746 100644
--- a/arch/arm/mach-msm/board-holiday-audio-data.h
+++ b/arch/arm/mach-msm/board-holiday-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-holiday-audio.c b/arch/arm/mach-msm/board-holiday-audio.c
index 3dd2c17..afceaac 100644
--- a/arch/arm/mach-msm/board-holiday-audio.c
+++ b/arch/arm/mach-msm/board-holiday-audio.c
@@ -19,11 +19,11 @@
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
#include <linux/regulator/consumer.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/gpio.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v2_1x/snddev_icodec.h>
#include <mach/qdsp6v2_1x/snddev_ecodec.h>
#include <mach/qdsp6v2_1x/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-holiday.c b/arch/arm/mach-msm/board-holiday.c
index ba774a0..59bc694 100644
--- a/arch/arm/mach-msm/board-holiday.c
+++ b/arch/arm/mach-msm/board-holiday.c
@@ -98,7 +98,7 @@
#include <mach/htc_headset_pmic.h>
#include <mach/htc_headset_8x60.h>
#include <linux/i2c/isl9519.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android.h>
#include <mach/usbdiag.h>
diff --git a/arch/arm/mach-msm/board-pyramid-audio-data.h b/arch/arm/mach-msm/board-pyramid-audio-data.h
index 1675e2d..bfbe52d 100644
--- a/arch/arm/mach-msm/board-pyramid-audio-data.h
+++ b/arch/arm/mach-msm/board-pyramid-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-pyramid-audio.c b/arch/arm/mach-msm/board-pyramid-audio.c
index 6d21404..b91aac7 100644
--- a/arch/arm/mach-msm/board-pyramid-audio.c
+++ b/arch/arm/mach-msm/board-pyramid-audio.c
@@ -18,11 +18,11 @@
#include <linux/mfd/marimba.h>
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/gpio.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v3/snddev_icodec.h>
#include <mach/qdsp6v3/snddev_ecodec.h>
#include <mach/qdsp6v3/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-pyramid.c b/arch/arm/mach-msm/board-pyramid.c
index a6edfab..dd6be66 100644
--- a/arch/arm/mach-msm/board-pyramid.c
+++ b/arch/arm/mach-msm/board-pyramid.c
@@ -96,7 +96,7 @@
#include <linux/i2c/isl9519.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/usbdiag.h>
#endif
#include <linux/regulator/consumer.h>
diff --git a/arch/arm/mach-msm/board-ruby-audio-data.h b/arch/arm/mach-msm/board-ruby-audio-data.h
index 4566c34..cb106c4 100644
--- a/arch/arm/mach-msm/board-ruby-audio-data.h
+++ b/arch/arm/mach-msm/board-ruby-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-ruby-audio.c b/arch/arm/mach-msm/board-ruby-audio.c
index 91e8176..c4d895b 100644
--- a/arch/arm/mach-msm/board-ruby-audio.c
+++ b/arch/arm/mach-msm/board-ruby-audio.c
@@ -19,11 +19,11 @@
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
#include <linux/regulator/consumer.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/gpio.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v3/snddev_icodec.h>
#include <mach/qdsp6v3/snddev_ecodec.h>
#include <mach/qdsp6v3/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-ruby.c b/arch/arm/mach-msm/board-ruby.c
index 9bf80a3..06ad90b 100644
--- a/arch/arm/mach-msm/board-ruby.c
+++ b/arch/arm/mach-msm/board-ruby.c
@@ -101,7 +101,7 @@
#include <mach/htc_headset_misc.h>
#include <mach/htc_headset_8x60.h>
#include <linux/i2c/isl9519.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android.h>
#include <mach/usbdiag.h>
diff --git a/arch/arm/mach-msm/board-shooter-audio-data.h b/arch/arm/mach-msm/board-shooter-audio-data.h
index 1675e2d..bfbe52d 100644
--- a/arch/arm/mach-msm/board-shooter-audio-data.h
+++ b/arch/arm/mach-msm/board-shooter-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-shooter-audio.c b/arch/arm/mach-msm/board-shooter-audio.c
index 0e4c5b0..a09da9f 100644
--- a/arch/arm/mach-msm/board-shooter-audio.c
+++ b/arch/arm/mach-msm/board-shooter-audio.c
@@ -19,10 +19,10 @@
#include <linux/mfd/marimba.h>
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v3/snddev_icodec.h>
#include <mach/qdsp6v3/snddev_ecodec.h>
#include <mach/qdsp6v3/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-shooter.c b/arch/arm/mach-msm/board-shooter.c
index 7d9715e..8dcdf23 100644
--- a/arch/arm/mach-msm/board-shooter.c
+++ b/arch/arm/mach-msm/board-shooter.c
@@ -99,7 +99,7 @@
#include <linux/i2c/isl9519.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/usbdiag.h>
#endif
#include <linux/regulator/consumer.h>
diff --git a/arch/arm/mach-msm/board-shooter_u-audio-data.h b/arch/arm/mach-msm/board-shooter_u-audio-data.h
index 752c8dc..ea5361f 100644
--- a/arch/arm/mach-msm/board-shooter_u-audio-data.h
+++ b/arch/arm/mach-msm/board-shooter_u-audio-data.h
@@ -12,7 +12,7 @@
*
*/
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
static CODEC_SPI_CMD LOOPBACK_DSP_INIT[] = {
{'w', 0x00, 0x01},
diff --git a/arch/arm/mach-msm/board-shooter_u-audio.c b/arch/arm/mach-msm/board-shooter_u-audio.c
index c5bdb72..5bb2235 100644
--- a/arch/arm/mach-msm/board-shooter_u-audio.c
+++ b/arch/arm/mach-msm/board-shooter_u-audio.c
@@ -18,11 +18,11 @@
#include <linux/mfd/marimba.h>
#include <linux/delay.h>
#include <linux/pmic8058-othc.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/gpio.h>
#include <mach/dal.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/qdsp6v3/snddev_icodec.h>
#include <mach/qdsp6v3/snddev_ecodec.h>
#include <mach/qdsp6v3/snddev_hdmi.h>
diff --git a/arch/arm/mach-msm/board-shooter_u.c b/arch/arm/mach-msm/board-shooter_u.c
index a53563b..f536fa0 100644
--- a/arch/arm/mach-msm/board-shooter_u.c
+++ b/arch/arm/mach-msm/board-shooter_u.c
@@ -98,7 +98,7 @@
#include <linux/i2c/isl9519.h>
#ifdef CONFIG_USB_G_ANDROID
#include <linux/usb/android.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <mach/usbdiag.h>
#endif
#include <linux/regulator/consumer.h>
diff --git a/arch/arm/mach-msm/include/mach/qdsp6v2_1x/snddev_icodec.h b/arch/arm/mach-msm/include/mach/qdsp6v2_1x/snddev_icodec.h
index 06f31f5..ec9901b 100644
--- a/arch/arm/mach-msm/include/mach/qdsp6v2_1x/snddev_icodec.h
+++ b/arch/arm/mach-msm/include/mach/qdsp6v2_1x/snddev_icodec.h
@@ -30,7 +30,7 @@
#define __MACH_QDSP6V2_SNDDEV_ICODEC_H
#include <linux/mfd/msm-adie-codec.h>
#include <mach/qdsp5v2/audio_def.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/pmic.h>
struct snddev_icodec_data {
diff --git a/arch/arm/mach-msm/include/mach/qdsp6v3/snddev_icodec.h b/arch/arm/mach-msm/include/mach/qdsp6v3/snddev_icodec.h
index 06f31f5..ec9901b 100644
--- a/arch/arm/mach-msm/include/mach/qdsp6v3/snddev_icodec.h
+++ b/arch/arm/mach-msm/include/mach/qdsp6v3/snddev_icodec.h
@@ -30,7 +30,7 @@
#define __MACH_QDSP6V2_SNDDEV_ICODEC_H
#include <linux/mfd/msm-adie-codec.h>
#include <mach/qdsp5v2/audio_def.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/pmic.h>
struct snddev_icodec_data {
diff --git a/arch/arm/mach-msm/qdsp6v2_1x/board-msm8x60-audio.c b/arch/arm/mach-msm/qdsp6v2_1x/board-msm8x60-audio.c
index 3d54d15..5a6d11f 100644
--- a/arch/arm/mach-msm/qdsp6v2_1x/board-msm8x60-audio.c
+++ b/arch/arm/mach-msm/qdsp6v2_1x/board-msm8x60-audio.c
@@ -52,7 +52,7 @@
#include <mach/qdsp6v2_1x/snddev_hdmi.h>
#include "snddev_mi2s.h"
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include "snddev_virtual.h"
diff --git a/arch/arm/mach-msm/qdsp6v2_1x/snddev_icodec.c b/arch/arm/mach-msm/qdsp6v2_1x/snddev_icodec.c
index 3e31f02..d316c02 100644
--- a/arch/arm/mach-msm/qdsp6v2_1x/snddev_icodec.c
+++ b/arch/arm/mach-msm/qdsp6v2_1x/snddev_icodec.c
@@ -32,7 +32,7 @@
#include <mach/pmic.h>
#include <mach/debug_mm.h>
#include <mach/qdsp6v2_1x/snddev_icodec.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/qdsp6v2_1x/q6afe.h>
#include "audio_acdb.h"
diff --git a/arch/arm/mach-msm/qdsp6v3/board-msm8x60-audio.c b/arch/arm/mach-msm/qdsp6v3/board-msm8x60-audio.c
index 00ba57e..da67398 100644
--- a/arch/arm/mach-msm/qdsp6v3/board-msm8x60-audio.c
+++ b/arch/arm/mach-msm/qdsp6v3/board-msm8x60-audio.c
@@ -48,7 +48,7 @@
#include <mach/qdsp6v3/snddev_hdmi.h>
#include "snddev_mi2s.h"
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include "snddev_virtual.h"
diff --git a/arch/arm/mach-msm/qdsp6v3/snddev_icodec.c b/arch/arm/mach-msm/qdsp6v3/snddev_icodec.c
index f23797c..ca0e6c3 100644
--- a/arch/arm/mach-msm/qdsp6v3/snddev_icodec.c
+++ b/arch/arm/mach-msm/qdsp6v3/snddev_icodec.c
@@ -32,7 +32,7 @@
#include <mach/pmic.h>
#include <mach/debug_mm.h>
#include <mach/qdsp6v3/snddev_icodec.h>
-#include <linux/spi/spi_aic3254.h>
+#include <linux/spi_aic3254.h>
#include <mach/qdsp6v3/q6afe.h>
#include "audio_acdb.h"
diff --git a/drivers/i2c/chips/tpa2051d3.c b/drivers/i2c/chips/tpa2051d3.c
index 4293a17..e6c8eae 100644
--- a/drivers/i2c/chips/tpa2051d3.c
+++ b/drivers/i2c/chips/tpa2051d3.c
@@ -25,7 +25,7 @@
#include <linux/input.h>
#include <linux/workqueue.h>
#include <linux/freezer.h>
-#include <mach/tpa2051d3.h>
+#include <linux/tpa2051d3.h>
#include <linux/mutex.h>
#include <linux/gpio.h>
diff --git a/drivers/spi/spi_aic3254.c b/drivers/spi/spi_aic3254.c
index c4335c1..dc51f8f 100644
--- a/drivers/spi/spi_aic3254.c
+++ b/drivers/spi/spi_aic3254.c
@@ -20,8 +20,8 @@
#include <linux/fs.h>
#include <linux/uaccess.h>
#include <linux/spi/spi.h>
-#include <linux/spi/spi_aic3254.h>
-#include <linux/spi/spi_aic3254_reg.h>
+#include <linux/spi_aic3254.h>
+#include <linux/spi_aic3254_reg.h>
#include <linux/delay.h>
#include <linux/clk.h>
#include <linux/wakelock.h>
diff --git a/include/linux/msm_ion.h b/include/linux/msm_ion.h
new file mode 100644
index 0000000..71ebfc1
--- /dev/null
+++ b/include/linux/msm_ion.h
@@ -0,0 +1,18 @@
+/*
+ * include/linux/ion.h
+ *
+ * Copyright (C) 2011 Google, Inc.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/ion.h>
diff --git a/include/linux/spi/spi_aic3254.h b/include/linux/spi_aic3254.h
similarity index 100%
rename from include/linux/spi/spi_aic3254.h
rename to include/linux/spi_aic3254.h
diff --git a/include/linux/spi/spi_aic3254_reg.h b/include/linux/spi_aic3254_reg.h
similarity index 100%
rename from include/linux/spi/spi_aic3254_reg.h
rename to include/linux/spi_aic3254_reg.h
diff --git a/arch/arm/mach-msm/include/mach/tpa2051d3.h b/include/linux/tpa2051d3.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/tpa2051d3.h
rename to include/linux/tpa2051d3.h
diff --git a/include/media/msm_camera.h b/include/media/msm_camera.h
index a3ba8ad..482f0eb 100644
--- a/include/media/msm_camera.h
+++ b/include/media/msm_camera.h
@@ -1,6 +1,8 @@
#ifndef __LINUX_MSM_CAMERA_H
#define __LINUX_MSM_CAMERA_H
-
+#ifdef CONFIG_ARCH_MSM8X60
+#include <media/msm_camera-8x60.h>
+#else
#ifdef MSM_CAMERA_BIONIC
#include <sys/types.h>
#endif
@@ -1132,4 +1134,5 @@
uint8_t vpe_can_use;
};
+#endif
#endif /* __LINUX_MSM_CAMERA_H */