From: Milan Svoboda <msvoboda@ra.rockwell.com>

This patch deletes file udc.h in include/asm-arm/arch-pxa and
include/asm-arm/arch-ixp4xx and creates the same file in include/asm-arm.

I'm not sure if this change is correct, but this header is same for those two
architectures and it's used by pxa2xx_udc driver only.  Do you have better
ideas?

Signed-off-by: Milan Svoboda <msvoboda@ra.rockwell.com>
Cc: Greg KH <greg@kroah.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 dev/null                        |   18 ------------------
 arch/arm/mach-ixp4xx/common.c   |    3 +--
 drivers/usb/gadget/pxa2xx_udc.c |    2 +-
 include/asm-arm/arch-pxa/udc.h  |   16 +---------------
 include/asm-arm/udc.h           |   13 +++++++++++++
 5 files changed, 16 insertions(+), 36 deletions(-)

diff -puN arch/arm/mach-ixp4xx/common.c~usb-gadget-clean-udch arch/arm/mach-ixp4xx/common.c
--- 25/arch/arm/mach-ixp4xx/common.c~usb-gadget-clean-udch	Thu May 25 11:58:35 2006
+++ 25-akpm/arch/arm/mach-ixp4xx/common.c	Thu May 25 11:58:35 2006
@@ -34,13 +34,12 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/irq.h>
+#include <asm/udc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/udc.h>
-
 /*************************************************************************
  * IXP4xx chipset I/O mapping
  *************************************************************************/
diff -puN drivers/usb/gadget/pxa2xx_udc.c~usb-gadget-clean-udch drivers/usb/gadget/pxa2xx_udc.c
--- 25/drivers/usb/gadget/pxa2xx_udc.c~usb-gadget-clean-udch	Thu May 25 11:58:35 2006
+++ 25-akpm/drivers/usb/gadget/pxa2xx_udc.c	Thu May 25 11:58:35 2006
@@ -60,7 +60,7 @@
 #include <linux/usb_ch9.h>
 #include <linux/usb_gadget.h>
 
-#include <asm/arch/udc.h>
+#include <asm/udc.h>
 
 
 /*
diff -L include/asm-arm/arch-ixp4xx/udc.h -puN include/asm-arm/arch-ixp4xx/udc.h~usb-gadget-clean-udch /dev/null
--- 25/include/asm-arm/arch-ixp4xx/udc.h
+++ /dev/null	Thu Apr 11 07:25:15 2002
@@ -1,18 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/udc.h
- *
- * This supports machine-specific differences in how the PXA2xx
- * USB Device Controller (UDC) is wired.
- *
- * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in
- * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
- */
-struct pxa2xx_udc_mach_info {
-        int  (*udc_is_connected)(void);		/* do we see host? */
-        void (*udc_command)(int cmd);
-#define	PXA2XX_UDC_CMD_CONNECT		0	/* let host see us */
-#define	PXA2XX_UDC_CMD_DISCONNECT	1	/* so host won't see us */
-};
-
-extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
-
diff -puN include/asm-arm/arch-pxa/udc.h~usb-gadget-clean-udch include/asm-arm/arch-pxa/udc.h
--- 25/include/asm-arm/arch-pxa/udc.h~usb-gadget-clean-udch	Thu May 25 11:58:35 2006
+++ 25-akpm/include/asm-arm/arch-pxa/udc.h	Thu May 25 11:58:35 2006
@@ -1,18 +1,4 @@
-/*
- * linux/include/asm-arm/arch-pxa/udc.h
- *
- * This supports machine-specific differences in how the PXA2xx
- * USB Device Controller (UDC) is wired.
- *
- * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in
- * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
- */
-struct pxa2xx_udc_mach_info {
-        int  (*udc_is_connected)(void);		/* do we see host? */
-        void (*udc_command)(int cmd);
-#define	PXA2XX_UDC_CMD_CONNECT		0	/* let host see us */
-#define	PXA2XX_UDC_CMD_DISCONNECT	1	/* so host won't see us */
-};
+#include <asm/udc.h>
 
 extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
 
diff -puN /dev/null include/asm-arm/udc.h
--- /dev/null	Thu Apr 11 07:25:15 2002
+++ 25-akpm/include/asm-arm/udc.h	Thu May 25 11:58:35 2006
@@ -0,0 +1,13 @@
+/*
+ * linux/include/asm-arm/udc.h
+ *
+ * This supports machine-specific differences in how the PXA2xx
+ * USB Device Controller (UDC) is wired.
+ *
+ */
+struct pxa2xx_udc_mach_info {
+        int  (*udc_is_connected)(void);		/* do we see host? */
+        void (*udc_command)(int cmd);
+#define	PXA2XX_UDC_CMD_CONNECT		0	/* let host see us */
+#define	PXA2XX_UDC_CMD_DISCONNECT	1	/* so host won't see us */
+};
_