From 62a79580fccdfa1d136b45e761e542e9eeb94520 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:12:11 +0200
Subject: [PATCH] --- yaml --- r: 327131 b: refs/heads/master c:
 a3b2924547a79cb6dba683d737501c01476f9fb3 h: refs/heads/master i:   327129:
 0baa7d4d8de86990203ec1357b3f4a9193f3c54e   327127:
 113f18b7acb53d97e54d0e8536ca8e680dc82781 v: v3

---
 [refs]                                                      | 2 +-
 trunk/Documentation/spi/ep93xx_spi                          | 2 +-
 trunk/arch/arm/mach-ep93xx/core.c                           | 6 +++---
 trunk/arch/arm/mach-ep93xx/dma.c                            | 2 +-
 trunk/arch/arm/mach-ep93xx/edb93xx.c                        | 4 ++--
 trunk/arch/arm/mach-ep93xx/simone.c                         | 2 +-
 trunk/arch/arm/mach-ep93xx/snappercl15.c                    | 2 +-
 trunk/arch/arm/mach-ep93xx/vision_ep9307.c                  | 4 ++--
 trunk/drivers/ata/pata_ep93xx.c                             | 2 +-
 trunk/drivers/dma/ep93xx_dma.c                              | 2 +-
 trunk/drivers/input/keyboard/ep93xx_keypad.c                | 2 +-
 trunk/drivers/spi/spi-ep93xx.c                              | 4 ++--
 trunk/drivers/video/ep93xx-fb.c                             | 2 +-
 .../mach/dma.h => include/linux/platform_data/dma-ep93xx.h} | 0
 .../linux/platform_data/keypad-ep93xx.h}                    | 0
 .../linux/platform_data/spi-ep93xx.h}                       | 0
 .../fb.h => include/linux/platform_data/video-ep93xx.h}     | 0
 trunk/sound/soc/ep93xx/ep93xx-ac97.c                        | 2 +-
 trunk/sound/soc/ep93xx/ep93xx-i2s.c                         | 2 +-
 trunk/sound/soc/ep93xx/ep93xx-pcm.c                         | 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)
 rename trunk/{arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h} (100%)
 rename trunk/{arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h} (100%)
 rename trunk/{arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h} (100%)
 rename trunk/{arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h} (100%)

diff --git a/[refs] b/[refs]
index 0dc85a0c8763..2ccc0a0ae922 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2a0833e5157fab6cac5f57a49b2f31eb418a39
+refs/heads/master: a3b2924547a79cb6dba683d737501c01476f9fb3
diff --git a/trunk/Documentation/spi/ep93xx_spi b/trunk/Documentation/spi/ep93xx_spi
index d8eb01c15db1..832ddce6e5fb 100644
--- a/trunk/Documentation/spi/ep93xx_spi
+++ b/trunk/Documentation/spi/ep93xx_spi
@@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c:
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/spi-ep93xx.h>
 
 /* this is our GPIO line used for chip select */
 #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9
diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c
index 4afe52aaaff3..e85bf17f2d2a 100644
--- a/trunk/arch/arm/mach-ep93xx/core.c
+++ b/trunk/arch/arm/mach-ep93xx/core.c
@@ -36,9 +36,9 @@
 #include <linux/export.h>
 
 #include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_keypad.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/keypad-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
 #include <asm/mach/map.h>
diff --git a/trunk/arch/arm/mach-ep93xx/dma.c b/trunk/arch/arm/mach-ep93xx/dma.c
index 16976d7bdc8a..d8bfd02f5047 100644
--- a/trunk/arch/arm/mach-ep93xx/dma.c
+++ b/trunk/arch/arm/mach-ep93xx/dma.c
@@ -25,7 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 #include <mach/hardware.h>
 
 #include "soc.h"
diff --git a/trunk/arch/arm/mach-ep93xx/edb93xx.c b/trunk/arch/arm/mach-ep93xx/edb93xx.c
index 337ab7cf4c16..b8f53d57a299 100644
--- a/trunk/arch/arm/mach-ep93xx/edb93xx.c
+++ b/trunk/arch/arm/mach-ep93xx/edb93xx.c
@@ -35,8 +35,8 @@
 #include <sound/cs4271.h>
 
 #include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
 #include <asm/hardware/vic.h>
diff --git a/trunk/arch/arm/mach-ep93xx/simone.c b/trunk/arch/arm/mach-ep93xx/simone.c
index 33dc07917417..0eb3f17a6fa2 100644
--- a/trunk/arch/arm/mach-ep93xx/simone.c
+++ b/trunk/arch/arm/mach-ep93xx/simone.c
@@ -22,7 +22,7 @@
 #include <linux/i2c-gpio.h>
 
 #include <mach/hardware.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
 #include <asm/hardware/vic.h>
diff --git a/trunk/arch/arm/mach-ep93xx/snappercl15.c b/trunk/arch/arm/mach-ep93xx/snappercl15.c
index 01abd3516a77..50043eef1cf2 100644
--- a/trunk/arch/arm/mach-ep93xx/snappercl15.c
+++ b/trunk/arch/arm/mach-ep93xx/snappercl15.c
@@ -28,7 +28,7 @@
 #include <linux/mtd/nand.h>
 
 #include <mach/hardware.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
 #include <asm/hardware/vic.h>
diff --git a/trunk/arch/arm/mach-ep93xx/vision_ep9307.c b/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
index 2905a4929bdc..ba92e25e3016 100644
--- a/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -30,8 +30,8 @@
 #include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
 #include <asm/hardware/vic.h>
diff --git a/trunk/drivers/ata/pata_ep93xx.c b/trunk/drivers/ata/pata_ep93xx.c
index 6ef2e3741f76..e056406d6a11 100644
--- a/trunk/drivers/ata/pata_ep93xx.c
+++ b/trunk/drivers/ata/pata_ep93xx.c
@@ -43,7 +43,7 @@
 #include <linux/dmaengine.h>
 #include <linux/ktime.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 #include <mach/platform.h>
 
 #define DRV_NAME	"ep93xx-ide"
diff --git a/trunk/drivers/dma/ep93xx_dma.c b/trunk/drivers/dma/ep93xx_dma.c
index c64917ec313d..4aeaea77f72e 100644
--- a/trunk/drivers/dma/ep93xx_dma.c
+++ b/trunk/drivers/dma/ep93xx_dma.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 
 #include "dmaengine.h"
 
diff --git a/trunk/drivers/input/keyboard/ep93xx_keypad.c b/trunk/drivers/input/keyboard/ep93xx_keypad.c
index c46fc8185469..7363402de8d4 100644
--- a/trunk/drivers/input/keyboard/ep93xx_keypad.c
+++ b/trunk/drivers/input/keyboard/ep93xx_keypad.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 
 #include <mach/hardware.h>
-#include <mach/ep93xx_keypad.h>
+#include <linux/platform_data/keypad-ep93xx.h>
 
 /*
  * Keypad Interface Register offsets
diff --git a/trunk/drivers/spi/spi-ep93xx.c b/trunk/drivers/spi/spi-ep93xx.c
index f97f1d248800..3a219599612a 100644
--- a/trunk/drivers/spi/spi-ep93xx.c
+++ b/trunk/drivers/spi/spi-ep93xx.c
@@ -31,8 +31,8 @@
 #include <linux/scatterlist.h>
 #include <linux/spi/spi.h>
 
-#include <mach/dma.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/dma-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
 
 #define SSPCR0			0x0000
 #define SSPCR0_MODE_SHIFT	6
diff --git a/trunk/drivers/video/ep93xx-fb.c b/trunk/drivers/video/ep93xx-fb.c
index 345d96230978..f2c092da84b0 100644
--- a/trunk/drivers/video/ep93xx-fb.c
+++ b/trunk/drivers/video/ep93xx-fb.c
@@ -24,7 +24,7 @@
 #include <linux/clk.h>
 #include <linux/fb.h>
 
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
 
 /* Vertical Frame Timing Registers */
 #define EP93XXFB_VLINES_TOTAL			0x0000	/* SW locked */
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/dma.h b/trunk/include/linux/platform_data/dma-ep93xx.h
similarity index 100%
rename from trunk/arch/arm/mach-ep93xx/include/mach/dma.h
rename to trunk/include/linux/platform_data/dma-ep93xx.h
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/trunk/include/linux/platform_data/keypad-ep93xx.h
similarity index 100%
rename from trunk/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
rename to trunk/include/linux/platform_data/keypad-ep93xx.h
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h b/trunk/include/linux/platform_data/spi-ep93xx.h
similarity index 100%
rename from trunk/arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
rename to trunk/include/linux/platform_data/spi-ep93xx.h
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/fb.h b/trunk/include/linux/platform_data/video-ep93xx.h
similarity index 100%
rename from trunk/arch/arm/mach-ep93xx/include/mach/fb.h
rename to trunk/include/linux/platform_data/video-ep93xx.h
diff --git a/trunk/sound/soc/ep93xx/ep93xx-ac97.c b/trunk/sound/soc/ep93xx/ep93xx-ac97.c
index bdffab33e160..c3521653cfd3 100644
--- a/trunk/sound/soc/ep93xx/ep93xx-ac97.c
+++ b/trunk/sound/soc/ep93xx/ep93xx-ac97.c
@@ -21,7 +21,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/soc.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 #include "ep93xx-pcm.h"
 
 /*
diff --git a/trunk/sound/soc/ep93xx/ep93xx-i2s.c b/trunk/sound/soc/ep93xx/ep93xx-i2s.c
index 8df8f6dc474f..ac4a7515e7be 100644
--- a/trunk/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/trunk/sound/soc/ep93xx/ep93xx-i2s.c
@@ -28,7 +28,7 @@
 
 #include <mach/hardware.h>
 #include <mach/ep93xx-regs.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 
 #include "ep93xx-pcm.h"
 
diff --git a/trunk/sound/soc/ep93xx/ep93xx-pcm.c b/trunk/sound/soc/ep93xx/ep93xx-pcm.c
index 4eea98b42bc8..665d9c94cc17 100644
--- a/trunk/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/trunk/sound/soc/ep93xx/ep93xx-pcm.c
@@ -25,7 +25,7 @@
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
 #include <mach/hardware.h>
 #include <mach/ep93xx-regs.h>