From 583416aa03ef5b5ffa8916d0e277fef875243fe7 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 21 Sep 2012 10:23:44 +0100
Subject: [PATCH] --- yaml --- r: 339503 b: refs/heads/master c:
 46000065a631c6d21452d533baf086175c384ba4 h: refs/heads/master i:   339501:
 de5496ac8142f2dedfd7dd49092eb514af2ba468   339499:
 9fd65415f649d0179489416cd05012f2abc80508   339495:
 d34a1edfd240c462616692f0869a0e84903618d3   339487:
 a2816f73a1b485438f271a351ece13d6f7aed9fb v: v3

---
 [refs]                                                       | 2 +-
 trunk/arch/arm/mach-ixp4xx/include/mach/udc.h                | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/udc.h                   | 2 +-
 trunk/drivers/usb/gadget/pxa25x_udc.c                        | 4 +---
 .../linux/platform_data/pxa2xx_udc.h}                        | 5 +++--
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename trunk/{arch/arm/include/asm/mach/udc_pxa2xx.h => include/linux/platform_data/pxa2xx_udc.h} (94%)

diff --git a/[refs] b/[refs]
index 8ee41856e251..1315e01e3178 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6920b5a791bbb54810159fbf6acf2c6ae14cdd22
+refs/heads/master: 46000065a631c6d21452d533baf086175c384ba4
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h b/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h
index 80d6da2eafac..7bd8b96c8843 100644
--- a/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h
+++ b/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h
@@ -2,7 +2,7 @@
  * arch/arm/mach-ixp4xx/include/mach/udc.h
  *
  */
-#include <asm/mach/udc_pxa2xx.h>
+#include <linux/platform_data/pxa2xx_udc.h>
 
 extern void ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info);
 
diff --git a/trunk/arch/arm/mach-pxa/include/mach/udc.h b/trunk/arch/arm/mach-pxa/include/mach/udc.h
index 2f82332e81a0..9a827e32db98 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/udc.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/udc.h
@@ -2,7 +2,7 @@
  * arch/arm/mach-pxa/include/mach/udc.h
  *
  */
-#include <asm/mach/udc_pxa2xx.h>
+#include <linux/platform_data/pxa2xx_udc.h>
 
 extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
 
diff --git a/trunk/drivers/usb/gadget/pxa25x_udc.c b/trunk/drivers/usb/gadget/pxa25x_udc.c
index 8efbf08c3561..d4ca9f1f7f24 100644
--- a/trunk/drivers/usb/gadget/pxa25x_udc.c
+++ b/trunk/drivers/usb/gadget/pxa25x_udc.c
@@ -29,6 +29,7 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
+#include <linux/platform_data/pxa2xx_udc.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/irq.h>
@@ -59,9 +60,6 @@
 #include <mach/lubbock.h>
 #endif
 
-#include <asm/mach/udc_pxa2xx.h>
-
-
 /*
  * This driver handles the USB Device Controller (UDC) in Intel's PXA 25x
  * series processors.  The UDC for the IXP 4xx series is very similar.
diff --git a/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h b/trunk/include/linux/platform_data/pxa2xx_udc.h
similarity index 94%
rename from trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
rename to trunk/include/linux/platform_data/pxa2xx_udc.h
index ea297ac70bc6..c6c5e98b5b82 100644
--- a/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
+++ b/trunk/include/linux/platform_data/pxa2xx_udc.h
@@ -1,6 +1,4 @@
 /*
- * arch/arm/include/asm/mach/udc_pxa2xx.h
- *
  * This supports machine-specific differences in how the PXA2xx
  * USB Device Controller (UDC) is wired.
  *
@@ -8,6 +6,8 @@
  * linux/arch/mach-ixp4xx/<machine>.c and used in
  * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
  */
+#ifndef PXA2XX_UDC_H
+#define PXA2XX_UDC_H
 
 struct pxa2xx_udc_mach_info {
         int  (*udc_is_connected)(void);		/* do we see host? */
@@ -24,3 +24,4 @@ struct pxa2xx_udc_mach_info {
 	int	gpio_pullup;			/* high == pullup activated */
 };
 
+#endif