Merge branch 'tracking-ll-last-minute-fixes' into merge-linux-linaroll-20120625.0

11 files changed, 5 insertions, 7 deletions

diff --git a/arch/arm/mach-exynos/include/mach/asv.h b/arch/arm/mach-exynos/include/mach-exynos/asv.h
index 5b48b74811e2..5b48b74811e2 100644
--- a/arch/arm/mach-exynos/include/mach/asv.h
+++ b/arch/arm/mach-exynos/include/mach-exynos/asv.h
diff --git a/arch/arm/mach-exynos/include/mach/mali/config.h b/arch/arm/mach-exynos/include/mach-exynos/mali/config.h
index ccd3cf7d2450..ccd3cf7d2450 100644
--- a/arch/arm/mach-exynos/include/mach/mali/config.h
+++ b/arch/arm/mach-exynos/include/mach-exynos/mali/config.h
diff --git a/arch/arm/mach-exynos/include/mach/regs-iem.h b/arch/arm/mach-exynos/include/mach-exynos/regs-iem.h
index d9bf17778584..d9bf17778584 100644
--- a/arch/arm/mach-exynos/include/mach/regs-iem.h
+++ b/arch/arm/mach-exynos/include/mach-exynos/regs-iem.h
diff --git a/arch/arm/mach-exynos/include/mach/ump/config.h b/arch/arm/mach-exynos/include/mach-exynos/ump/config.h
index a82934f27990..a82934f27990 100644
--- a/arch/arm/mach-exynos/include/mach/ump/config.h
+++ b/arch/arm/mach-exynos/include/mach-exynos/ump/config.h
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 8dda041010f1..488a6993a37a 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -9,7 +9,6 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 #include <linux/clkdev.h>
-#include <mach-vexpress/clkdev.h>
 
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/cache-l2x0.h>
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 9aa733fe621c..b1f1e56db004 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -35,7 +35,6 @@
 
 #include <mach-vexpress/ct-ca9x4.h>
 #include <mach-vexpress/motherboard.h>
-#include <mach-vexpress/clkdev.h>
 
 #include <plat-versatile/sched_clock.h>
 
diff --git a/arch/arm/plat-samsung/include/plat/hdmi.h b/arch/arm/plat-samsung/include/plat-samsung/hdmi.h
index 5dc73474dd09..5dc73474dd09 100644
--- a/arch/arm/plat-samsung/include/plat/hdmi.h
+++ b/arch/arm/plat-samsung/include/plat-samsung/hdmi.h
diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile
index 263e076a4a9a..b4a9e259fd62 100755
--- a/drivers/gpu/arm/mali/Makefile
+++ b/drivers/gpu/arm/mali/Makefile
@@ -18,7 +18,7 @@ KBUILDROOT =
 # Add platform configuration file for Mali
 #ifeq ($(CONFIG_ARCH_EXYNOS4),y)
 MACHDIR  := $(srctree)/arch/arm/mach-exynos
-MALICONFIGDIR :=$(MACHDIR)/include/mach/mali
+MALICONFIGDIR :=$(MACHDIR)/include/mach-exynos/mali
 #endif
 
 USING_DED=0
diff --git a/drivers/gpu/arm/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali/linux/mali_osk_mali.c
index 06a27bc4f917..591430c123c0 100644
--- a/drivers/gpu/arm/mali/linux/mali_osk_mali.c
+++ b/drivers/gpu/arm/mali/linux/mali_osk_mali.c
@@ -19,8 +19,8 @@
 #include "mali_osk.h"           /* kernel side OS functions */
 #include "mali_uk_types.h"
 #include "mali_kernel_linux.h"  /* exports initialize/terminate_kernel_device() definition of mali_osk_low_level_mem_init() and term */
-#include <mach/irqs.h>
-#include <mach/mali/config.h>        /* contains the configuration of the arch we are compiling for */
+#include <mach-exynos/irqs.h>
+#include <mach-exynos/mali/config.h>        /* contains the configuration of the arch we are compiling for */
 
 /* is called from mali_kernel_constructor in common code */
 _mali_osk_errcode_t _mali_osk_init( void )
diff --git a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c
index 04a55ab6185c..5bc06513b4b0 100644
--- a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c
+++ b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c
@@ -18,7 +18,7 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
-#include <mach/ump/config.h>             /* Configuration for current platform. The symlinc for arch is set by Makefile */
+#include <mach-exynos/ump/config.h>             /* Configuration for current platform. The symlinc for arch is set by Makefile */
 #include "ump_ioctl.h"
 #include "ump_kernel_common.h"
 #include "ump_kernel_interface.h"
diff --git a/drivers/gpu/arm/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/ump/linux/ump_memory_backend.c
index d4444cad7e14..1e5e3cc9373d 100644
--- a/drivers/gpu/arm/ump/linux/ump_memory_backend.c
+++ b/drivers/gpu/arm/ump/linux/ump_memory_backend.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>            /* kernel module definitions */
 #include <linux/ioport.h>            /* request_mem_region */
 
-#include <mach/ump/config.h>         /* Configuration for current platform. The symlink for arch is set by Makefile */
+#include <mach-exynos/ump/config.h>         /* Configuration for current platform. The symlink for arch is set by Makefile */
 
 #include "ump_osk.h"
 #include "ump_kernel_common.h"