From 8af1b9005efbdfff4bf58dd429a79491fb8e559d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 21 Mar 2013 22:51:12 +0100
Subject: [PATCH] --- yaml --- r: 370709 b: refs/heads/master c:
 e657bcf6db84864079b31909e911a69c813aa0c0 h: refs/heads/master i:   370707:
 6d87a6af95a64f4ea0810fa65f5a0bd2cb2a7240 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/arm/mach-ux500/board-mop500-audio.c         | 2 +-
 trunk/arch/arm/mach-ux500/board-mop500-sdi.c           | 2 +-
 trunk/arch/arm/mach-ux500/board-mop500.c               | 4 ++--
 trunk/arch/arm/mach-ux500/cpu-db8500.c                 | 4 ++--
 trunk/arch/arm/mach-ux500/cpu.c                        | 4 ++--
 trunk/arch/arm/mach-ux500/devices-db8500.c             | 2 +-
 trunk/arch/arm/mach-ux500/devices.c                    | 2 +-
 trunk/arch/arm/mach-ux500/{include/mach => }/devices.h | 0
 trunk/arch/arm/mach-ux500/hotplug.c                    | 2 +-
 trunk/arch/arm/mach-ux500/id.c                         | 2 +-
 trunk/arch/arm/mach-ux500/platsmp.c                    | 2 +-
 trunk/arch/arm/mach-ux500/{include/mach => }/setup.h   | 0
 trunk/arch/arm/mach-ux500/timer.c                      | 2 +-
 trunk/drivers/clocksource/clksrc-dbx500-prcmu.c        | 2 --
 15 files changed, 15 insertions(+), 17 deletions(-)
 rename trunk/arch/arm/mach-ux500/{include/mach => }/devices.h (100%)
 rename trunk/arch/arm/mach-ux500/{include/mach => }/setup.h (100%)

diff --git a/[refs] b/[refs]
index 0febb3698afa..a4671010e0b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eba52748bee971207ddc44b926c12282d0741e2e
+refs/heads/master: e657bcf6db84864079b31909e911a69c813aa0c0
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-audio.c b/trunk/arch/arm/mach-ux500/board-mop500-audio.c
index def06372371e..aba9e5692958 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500-audio.c
@@ -10,7 +10,7 @@
 #include <linux/platform_data/pinctrl-nomadik.h>
 #include <linux/platform_data/dma-ste-dma40.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-sdi.c b/trunk/arch/arm/mach-ux500/board-mop500-sdi.c
index 0ada76787ca0..f76be4ade7c2 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -14,7 +14,7 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <asm/mach-types.h>
-#include <mach/devices.h>
+#include "devices.h"
 
 #include "db8500-regs.h"
 #include "devices-db8500.h"
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
index 6e8ee1127855..0d59e1ad810f 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -41,8 +41,8 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 #include "irqs.h"
 #include <linux/platform_data/crypto-ux500.h>
 
diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c
index e11f87d77afc..7a66a810274a 100644
--- a/trunk/arch/arm/mach-ux500/cpu-db8500.c
+++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c
@@ -28,8 +28,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 #include "irqs.h"
 
 #include "devices-db8500.h"
diff --git a/trunk/arch/arm/mach-ux500/cpu.c b/trunk/arch/arm/mach-ux500/cpu.c
index aa14c5f6e5fa..915e2636cbaa 100644
--- a/trunk/arch/arm/mach-ux500/cpu.c
+++ b/trunk/arch/arm/mach-ux500/cpu.c
@@ -24,8 +24,8 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 
 #include "board-mop500.h"
 #include "db8500-regs.h"
diff --git a/trunk/arch/arm/mach-ux500/devices-db8500.c b/trunk/arch/arm/mach-ux500/devices-db8500.c
index 45ec9559ef41..1cf94ce0feec 100644
--- a/trunk/arch/arm/mach-ux500/devices-db8500.c
+++ b/trunk/arch/arm/mach-ux500/devices-db8500.c
@@ -15,7 +15,7 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 #include <linux/mfd/dbx500-prcmu.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 #include "irqs.h"
 
 #include "db8500-regs.h"
diff --git a/trunk/arch/arm/mach-ux500/devices.c b/trunk/arch/arm/mach-ux500/devices.c
index f63a512190cb..0f9e52b95935 100644
--- a/trunk/arch/arm/mach-ux500/devices.c
+++ b/trunk/arch/arm/mach-ux500/devices.c
@@ -11,7 +11,7 @@
 #include <linux/io.h>
 #include <linux/amba/bus.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 
diff --git a/trunk/arch/arm/mach-ux500/include/mach/devices.h b/trunk/arch/arm/mach-ux500/devices.h
similarity index 100%
rename from trunk/arch/arm/mach-ux500/include/mach/devices.h
rename to trunk/arch/arm/mach-ux500/devices.h
diff --git a/trunk/arch/arm/mach-ux500/hotplug.c b/trunk/arch/arm/mach-ux500/hotplug.c
index 2f6af259015d..87abcf278432 100644
--- a/trunk/arch/arm/mach-ux500/hotplug.c
+++ b/trunk/arch/arm/mach-ux500/hotplug.c
@@ -15,7 +15,7 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 /*
  * platform-specific code to shutdown a CPU
diff --git a/trunk/arch/arm/mach-ux500/id.c b/trunk/arch/arm/mach-ux500/id.c
index a847cf27b93b..0d33d1a06955 100644
--- a/trunk/arch/arm/mach-ux500/id.c
+++ b/trunk/arch/arm/mach-ux500/id.c
@@ -14,7 +14,7 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 #include "id.h"
diff --git a/trunk/arch/arm/mach-ux500/platsmp.c b/trunk/arch/arm/mach-ux500/platsmp.c
index 8a9c070ec206..12ad8ad850aa 100644
--- a/trunk/arch/arm/mach-ux500/platsmp.c
+++ b/trunk/arch/arm/mach-ux500/platsmp.c
@@ -22,7 +22,7 @@
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 #include "id.h"
diff --git a/trunk/arch/arm/mach-ux500/include/mach/setup.h b/trunk/arch/arm/mach-ux500/setup.h
similarity index 100%
rename from trunk/arch/arm/mach-ux500/include/mach/setup.h
rename to trunk/arch/arm/mach-ux500/setup.h
diff --git a/trunk/arch/arm/mach-ux500/timer.c b/trunk/arch/arm/mach-ux500/timer.c
index 2dbbaefead14..290b9c5e5e28 100644
--- a/trunk/arch/arm/mach-ux500/timer.c
+++ b/trunk/arch/arm/mach-ux500/timer.c
@@ -13,7 +13,7 @@
 
 #include <asm/smp_twd.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 #include "irqs.h"
 
 #include "db8500-regs.h"
diff --git a/trunk/drivers/clocksource/clksrc-dbx500-prcmu.c b/trunk/drivers/clocksource/clksrc-dbx500-prcmu.c
index 4f34093bdb4e..54f3d119d99c 100644
--- a/trunk/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/trunk/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -17,8 +17,6 @@
 
 #include <asm/sched_clock.h>
 
-#include <mach/setup.h>
-
 #define RATE_32K		32768
 
 #define TIMER_MODE_CONTINOUS	0x1