From 591b2790419c19abe3d729fa833e2140bbfd1ad5 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:19:33 +0200
Subject: [PATCH] --- yaml --- r: 327140 b: refs/heads/master c:
 db298da2c31e1dcf7c9b7c9cef6217ad3449ebb7 h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-nomadik/board-nhk8815.c                     | 2 +-
 trunk/arch/arm/mach-ux500/board-mop500.c                        | 2 +-
 trunk/arch/arm/mach-ux500/cpu-db8500.c                          | 2 +-
 trunk/arch/arm/mach-ux500/devices-common.h                      | 2 +-
 trunk/arch/arm/mach-ux500/usb.c                                 | 2 +-
 trunk/drivers/crypto/ux500/cryp/cryp_core.c                     | 2 +-
 trunk/drivers/crypto/ux500/hash/hash_core.c                     | 2 +-
 trunk/drivers/input/keyboard/nomadik-ske-keypad.c               | 2 +-
 trunk/drivers/mtd/nand/nomadik_nand.c                           | 2 +-
 trunk/drivers/usb/musb/ux500_dma.c                              | 2 +-
 .../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
 .../ske.h => include/linux/platform_data/keypad-nomadik-ske.h}  | 0
 .../nand.h => include/linux/platform_data/mtd-nomadik-nand.h}   | 0
 .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h} | 0
 15 files changed, 11 insertions(+), 11 deletions(-)
 rename trunk/{arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
 rename trunk/{arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h} (100%)
 rename trunk/{arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h} (100%)
 rename trunk/{arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h} (100%)

diff --git a/[refs] b/[refs]
index 732696149e02..98d4382e4ac9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ecf4f05637183ffd0ac98f906e45e271030a55
+refs/heads/master: db298da2c31e1dcf7c9b7c9cef6217ad3449ebb7
diff --git a/trunk/arch/arm/mach-nomadik/board-nhk8815.c b/trunk/arch/arm/mach-nomadik/board-nhk8815.c
index f4535a7dadf5..381c08027df4 100644
--- a/trunk/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/trunk/arch/arm/mach-nomadik/board-nhk8815.c
@@ -34,7 +34,7 @@
 #include <plat/gpio-nomadik.h>
 #include <plat/mtu.h>
 
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
 #include <mach/fsmc.h>
 
 #include "cpu-8815.h"
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
index 8674a890fd1c..38854d40f779 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -48,7 +48,7 @@
 #include <mach/setup.h>
 #include <mach/devices.h>
 #include <mach/irqs.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
 
 #include "ste-dma40-db8500.h"
 #include "devices-db8500.h"
diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c
index db3c52d56ca4..1bef4c3b324c 100644
--- a/trunk/arch/arm/mach-ux500/cpu-db8500.c
+++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c
@@ -24,7 +24,7 @@
 #include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
 #include <mach/db8500-regs.h>
 
 #include "devices-db8500.h"
diff --git a/trunk/arch/arm/mach-ux500/devices-common.h b/trunk/arch/arm/mach-ux500/devices-common.h
index ecdd8386cffb..7fbf0ba336e1 100644
--- a/trunk/arch/arm/mach-ux500/devices-common.h
+++ b/trunk/arch/arm/mach-ux500/devices-common.h
@@ -13,7 +13,7 @@
 #include <linux/sys_soc.h>
 #include <linux/amba/bus.h>
 #include <linux/platform_data/i2c-nomadik.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
 
 struct spi_master_cntlr;
 
diff --git a/trunk/arch/arm/mach-ux500/usb.c b/trunk/arch/arm/mach-ux500/usb.c
index a74af389bc63..145482e74418 100644
--- a/trunk/arch/arm/mach-ux500/usb.c
+++ b/trunk/arch/arm/mach-ux500/usb.c
@@ -10,7 +10,7 @@
 
 #include <plat/ste_dma40.h>
 #include <mach/hardware.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
 
 #define MUSB_DMA40_RX_CH { \
 		.mode = STEDMA40_MODE_LOGICAL, \
diff --git a/trunk/drivers/crypto/ux500/cryp/cryp_core.c b/trunk/drivers/crypto/ux500/cryp/cryp_core.c
index 1c307e1b840c..ef17e3871c71 100644
--- a/trunk/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/trunk/drivers/crypto/ux500/cryp/cryp_core.c
@@ -32,7 +32,7 @@
 
 #include <plat/ste_dma40.h>
 
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
 #include <mach/hardware.h>
 
 #include "cryp_p.h"
diff --git a/trunk/drivers/crypto/ux500/hash/hash_core.c b/trunk/drivers/crypto/ux500/hash/hash_core.c
index 08d5032cb564..08765072a2b3 100644
--- a/trunk/drivers/crypto/ux500/hash/hash_core.c
+++ b/trunk/drivers/crypto/ux500/hash/hash_core.c
@@ -31,7 +31,7 @@
 #include <crypto/scatterwalk.h>
 #include <crypto/algapi.h>
 
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
 #include <mach/hardware.h>
 
 #include "hash_alg.h"
diff --git a/trunk/drivers/input/keyboard/nomadik-ske-keypad.c b/trunk/drivers/input/keyboard/nomadik-ske-keypad.c
index a880e7414202..49f5fa64e0b1 100644
--- a/trunk/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/trunk/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -20,7 +20,7 @@
 #include <linux/clk.h>
 #include <linux/module.h>
 
-#include <plat/ske.h>
+#include <linux/platform_data/keypad-nomadik-ske.h>
 
 /* SKE_CR bits */
 #define SKE_KPMLT	(0x1 << 6)
diff --git a/trunk/drivers/mtd/nand/nomadik_nand.c b/trunk/drivers/mtd/nand/nomadik_nand.c
index a86aa812ca13..9ee0c4edfacf 100644
--- a/trunk/drivers/mtd/nand/nomadik_nand.c
+++ b/trunk/drivers/mtd/nand/nomadik_nand.c
@@ -31,7 +31,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/slab.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
 #include <mach/fsmc.h>
 
 #include <mtd/mtd-abi.h>
diff --git a/trunk/drivers/usb/musb/ux500_dma.c b/trunk/drivers/usb/musb/ux500_dma.c
index d05c7fbbb703..f82246d2fd16 100644
--- a/trunk/drivers/usb/musb/ux500_dma.c
+++ b/trunk/drivers/usb/musb/ux500_dma.c
@@ -30,7 +30,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/pfn.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
 #include "musb_core.h"
 
 struct ux500_dma_channel {
diff --git a/trunk/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/trunk/include/linux/platform_data/crypto-ux500.h
similarity index 100%
rename from trunk/arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to trunk/include/linux/platform_data/crypto-ux500.h
diff --git a/trunk/arch/arm/plat-nomadik/include/plat/ske.h b/trunk/include/linux/platform_data/keypad-nomadik-ske.h
similarity index 100%
rename from trunk/arch/arm/plat-nomadik/include/plat/ske.h
rename to trunk/include/linux/platform_data/keypad-nomadik-ske.h
diff --git a/trunk/arch/arm/mach-nomadik/include/mach/nand.h b/trunk/include/linux/platform_data/mtd-nomadik-nand.h
similarity index 100%
rename from trunk/arch/arm/mach-nomadik/include/mach/nand.h
rename to trunk/include/linux/platform_data/mtd-nomadik-nand.h
diff --git a/trunk/arch/arm/mach-ux500/include/mach/usb.h b/trunk/include/linux/platform_data/usb-musb-ux500.h
similarity index 100%
rename from trunk/arch/arm/mach-ux500/include/mach/usb.h
rename to trunk/include/linux/platform_data/usb-musb-ux500.h