From 8e90400204fbfa4a7fe9688bc7716a0a4a0912f8 Mon Sep 17 00:00:00 2001
From: Dave Martin <dave.martin@linaro.org>
Date: Tue, 16 Oct 2012 11:54:00 +0100
Subject: [PATCH] --- yaml --- r: 339505 b: refs/heads/master c:
 153cd8e839b5729358d4e5c3371e7509ee5ac96a h: refs/heads/master i:   339503:
 583416aa03ef5b5ffa8916d0e277fef875243fe7 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/include/asm/mach/serial_at91.h | 33 +++++++++++++++++++
 .../arm/include/asm/mach/serial_sa1100.h}     |  6 ++--
 .../arm/include/asm/mach/udc_pxa2xx.h}        |  5 ++-
 trunk/arch/arm/mach-ixp4xx/include/mach/udc.h |  2 +-
 trunk/arch/arm/mach-pxa/include/mach/udc.h    |  2 +-
 trunk/arch/arm/mach-sa1100/assabet.c          |  2 +-
 trunk/arch/arm/mach-sa1100/badge4.c           |  2 +-
 trunk/arch/arm/mach-sa1100/cerf.c             |  2 +-
 trunk/arch/arm/mach-sa1100/collie.c           |  2 +-
 trunk/arch/arm/mach-sa1100/h3xxx.c            |  2 +-
 trunk/arch/arm/mach-sa1100/hackkit.c          |  2 +-
 trunk/arch/arm/mach-sa1100/jornada720.c       |  2 +-
 trunk/arch/arm/mach-sa1100/lart.c             |  2 +-
 trunk/arch/arm/mach-sa1100/nanoengine.c       |  2 +-
 trunk/arch/arm/mach-sa1100/neponset.c         |  2 +-
 trunk/arch/arm/mach-sa1100/pleb.c             |  2 +-
 trunk/arch/arm/mach-sa1100/shannon.c          |  2 +-
 trunk/arch/arm/mach-sa1100/simpad.c           |  2 +-
 trunk/arch/arm/mm/proc-v7.S                   |  2 +-
 .../arch/avr32/include/asm/mach/serial_at91.h | 33 +++++++++++++++++++
 trunk/drivers/tty/serial/atmel_serial.c       | 18 ++++++++++
 trunk/drivers/tty/serial/sa1100.c             |  2 +-
 trunk/drivers/usb/gadget/pxa25x_udc.c         |  4 ++-
 24 files changed, 109 insertions(+), 26 deletions(-)
 create mode 100644 trunk/arch/arm/include/asm/mach/serial_at91.h
 rename trunk/{include/linux/platform_data/sa11x0-serial.h => arch/arm/include/asm/mach/serial_sa1100.h} (93%)
 rename trunk/{include/linux/platform_data/pxa2xx_udc.h => arch/arm/include/asm/mach/udc_pxa2xx.h} (94%)
 create mode 100644 trunk/arch/avr32/include/asm/mach/serial_at91.h

diff --git a/[refs] b/[refs]
index aae4692033cd..65cdafd820db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95e629b761ce36996d1befe2824d5346b5a220b9
+refs/heads/master: 153cd8e839b5729358d4e5c3371e7509ee5ac96a
diff --git a/trunk/arch/arm/include/asm/mach/serial_at91.h b/trunk/arch/arm/include/asm/mach/serial_at91.h
new file mode 100644
index 000000000000..ea6d063923b8
--- /dev/null
+++ b/trunk/arch/arm/include/asm/mach/serial_at91.h
@@ -0,0 +1,33 @@
+/*
+ *  arch/arm/include/asm/mach/serial_at91.h
+ *
+ *  Based on serial_sa1100.h  by Nicolas Pitre
+ *
+ *  Copyright (C) 2002 ATMEL Rousset
+ *
+ *  Low level machine dependent UART functions.
+ */
+
+struct uart_port;
+
+/*
+ * This is a temporary structure for registering these
+ * functions; it is intended to be discarded after boot.
+ */
+struct atmel_port_fns {
+	void	(*set_mctrl)(struct uart_port *, u_int);
+	u_int	(*get_mctrl)(struct uart_port *);
+	void	(*enable_ms)(struct uart_port *);
+	void	(*pm)(struct uart_port *, u_int, u_int);
+	int	(*set_wake)(struct uart_port *, u_int);
+	int	(*open)(struct uart_port *);
+	void	(*close)(struct uart_port *);
+};
+
+#if defined(CONFIG_SERIAL_ATMEL)
+void atmel_register_uart_fns(struct atmel_port_fns *fns);
+#else
+#define atmel_register_uart_fns(fns) do { } while (0)
+#endif
+
+
diff --git a/trunk/include/linux/platform_data/sa11x0-serial.h b/trunk/arch/arm/include/asm/mach/serial_sa1100.h
similarity index 93%
rename from trunk/include/linux/platform_data/sa11x0-serial.h
rename to trunk/arch/arm/include/asm/mach/serial_sa1100.h
index 4504d5d592f0..d09064bf95a0 100644
--- a/trunk/include/linux/platform_data/sa11x0-serial.h
+++ b/trunk/arch/arm/include/asm/mach/serial_sa1100.h
@@ -1,12 +1,12 @@
 /*
+ *  arch/arm/include/asm/mach/serial_sa1100.h
+ *
  *  Author: Nicolas Pitre
  *
  * Moved and changed lots, Russell King
  *
  * Low level machine dependent UART functions.
  */
-#ifndef SA11X0_SERIAL_H
-#define SA11X0_SERIAL_H
 
 struct uart_port;
 struct uart_info;
@@ -29,5 +29,3 @@ void sa1100_register_uart(int idx, int port);
 #define sa1100_register_uart_fns(fns) do { } while (0)
 #define sa1100_register_uart(idx,port) do { } while (0)
 #endif
-
-#endif
diff --git a/trunk/include/linux/platform_data/pxa2xx_udc.h b/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
similarity index 94%
rename from trunk/include/linux/platform_data/pxa2xx_udc.h
rename to trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
index c6c5e98b5b82..ea297ac70bc6 100644
--- a/trunk/include/linux/platform_data/pxa2xx_udc.h
+++ b/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
@@ -1,4 +1,6 @@
 /*
+ * arch/arm/include/asm/mach/udc_pxa2xx.h
+ *
  * This supports machine-specific differences in how the PXA2xx
  * USB Device Controller (UDC) is wired.
  *
@@ -6,8 +8,6 @@
  * 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,4 +24,3 @@ struct pxa2xx_udc_mach_info {
 	int	gpio_pullup;			/* high == pullup activated */
 };
 
-#endif
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h b/trunk/arch/arm/mach-ixp4xx/include/mach/udc.h
index 7bd8b96c8843..80d6da2eafac 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 <linux/platform_data/pxa2xx_udc.h>
+#include <asm/mach/udc_pxa2xx.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 9a827e32db98..2f82332e81a0 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 <linux/platform_data/pxa2xx_udc.h>
+#include <asm/mach/udc_pxa2xx.h>
 
 extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
 
diff --git a/trunk/arch/arm/mach-sa1100/assabet.c b/trunk/arch/arm/mach-sa1100/assabet.c
index 9a23739f7026..6a7ad3c2a3fc 100644
--- a/trunk/arch/arm/mach-sa1100/assabet.c
+++ b/trunk/arch/arm/mach-sa1100/assabet.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/serial_core.h>
 #include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/irda.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <mach/assabet.h>
 #include <linux/platform_data/mfd-mcp-sa11x0.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mach-sa1100/badge4.c b/trunk/arch/arm/mach-sa1100/badge4.c
index b2dadf3ea3df..038df4894b0f 100644
--- a/trunk/arch/arm/mach-sa1100/badge4.c
+++ b/trunk/arch/arm/mach-sa1100/badge4.c
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/tty.h>
@@ -35,6 +34,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/sa1111.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/badge4.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/cerf.c b/trunk/arch/arm/mach-sa1100/cerf.c
index 304bca4a07c0..ad0eb08ea077 100644
--- a/trunk/arch/arm/mach-sa1100/cerf.c
+++ b/trunk/arch/arm/mach-sa1100/cerf.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/mtd/mtd.h>
@@ -28,6 +27,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/cerf.h>
 #include <linux/platform_data/mfd-mcp-sa11x0.h>
diff --git a/trunk/arch/arm/mach-sa1100/collie.c b/trunk/arch/arm/mach-sa1100/collie.c
index 45f424f5fca6..170cb6107f68 100644
--- a/trunk/arch/arm/mach-sa1100/collie.c
+++ b/trunk/arch/arm/mach-sa1100/collie.c
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
@@ -41,6 +40,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <asm/hardware/scoop.h>
 #include <asm/mach/sharpsl_param.h>
diff --git a/trunk/arch/arm/mach-sa1100/h3xxx.c b/trunk/arch/arm/mach-sa1100/h3xxx.c
index f17e7382242a..63150e1ffe9e 100644
--- a/trunk/arch/arm/mach-sa1100/h3xxx.c
+++ b/trunk/arch/arm/mach-sa1100/h3xxx.c
@@ -17,12 +17,12 @@
 #include <linux/mfd/htc-egpio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/h3xxx.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/hackkit.c b/trunk/arch/arm/mach-sa1100/hackkit.c
index d005939c41fc..fc106aab7c7e 100644
--- a/trunk/arch/arm/mach-sa1100/hackkit.c
+++ b/trunk/arch/arm/mach-sa1100/hackkit.c
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/cpufreq.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/serial_core.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -36,6 +35,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mach-sa1100/jornada720.c b/trunk/arch/arm/mach-sa1100/jornada720.c
index 35cfc428b4d4..e3084f47027d 100644
--- a/trunk/arch/arm/mach-sa1100/jornada720.c
+++ b/trunk/arch/arm/mach-sa1100/jornada720.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
@@ -31,6 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mach-sa1100/lart.c b/trunk/arch/arm/mach-sa1100/lart.c
index f69f78fc3ddd..3048b17e84c5 100644
--- a/trunk/arch/arm/mach-sa1100/lart.c
+++ b/trunk/arch/arm/mach-sa1100/lart.c
@@ -4,7 +4,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/tty.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
@@ -19,6 +18,7 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <linux/platform_data/mfd-mcp-sa11x0.h>
 #include <mach/irqs.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/nanoengine.c b/trunk/arch/arm/mach-sa1100/nanoengine.c
index 102e08f7b109..41f69d97066f 100644
--- a/trunk/arch/arm/mach-sa1100/nanoengine.c
+++ b/trunk/arch/arm/mach-sa1100/nanoengine.c
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/root_dev.h>
@@ -25,6 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 
 #include <mach/hardware.h>
 #include <mach/nanoengine.h>
diff --git a/trunk/arch/arm/mach-sa1100/neponset.c b/trunk/arch/arm/mach-sa1100/neponset.c
index 88be0474f3d7..266db873a4e4 100644
--- a/trunk/arch/arm/mach-sa1100/neponset.c
+++ b/trunk/arch/arm/mach-sa1100/neponset.c
@@ -7,7 +7,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/serial_core.h>
@@ -15,6 +14,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/sizes.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/pleb.c b/trunk/arch/arm/mach-sa1100/pleb.c
index c51bb63f90fb..37fe0a0a5369 100644
--- a/trunk/arch/arm/mach-sa1100/pleb.c
+++ b/trunk/arch/arm/mach-sa1100/pleb.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/ioport.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/io.h>
@@ -19,6 +18,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
+#include <asm/mach/serial_sa1100.h>
 #include <mach/irqs.h>
 
 #include "generic.h"
diff --git a/trunk/arch/arm/mach-sa1100/shannon.c b/trunk/arch/arm/mach-sa1100/shannon.c
index 6460d25fbb88..ff6b7b35bca9 100644
--- a/trunk/arch/arm/mach-sa1100/shannon.c
+++ b/trunk/arch/arm/mach-sa1100/shannon.c
@@ -5,7 +5,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/tty.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -19,6 +18,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <linux/platform_data/mfd-mcp-sa11x0.h>
 #include <mach/shannon.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mach-sa1100/simpad.c b/trunk/arch/arm/mach-sa1100/simpad.c
index 6d65f65fcb23..71790e581d93 100644
--- a/trunk/arch/arm/mach-sa1100/simpad.c
+++ b/trunk/arch/arm/mach-sa1100/simpad.c
@@ -9,7 +9,6 @@
 #include <linux/proc_fs.h>
 #include <linux/string.h>
 #include <linux/pm.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
@@ -24,6 +23,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <linux/platform_data/mfd-mcp-sa11x0.h>
 #include <mach/simpad.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S
index 846d279f3176..42cc833aa02f 100644
--- a/trunk/arch/arm/mm/proc-v7.S
+++ b/trunk/arch/arm/mm/proc-v7.S
@@ -57,7 +57,7 @@ ENTRY(cpu_v7_reset)
  THUMB(	bic	r1, r1, #1 << 30 )		@ SCTLR.TE (Thumb exceptions)
 	mcr	p15, 0, r1, c1, c0, 0		@ disable MMU
 	isb
-	mov	pc, r0
+	bx	r0
 ENDPROC(cpu_v7_reset)
 	.popsection
 
diff --git a/trunk/arch/avr32/include/asm/mach/serial_at91.h b/trunk/arch/avr32/include/asm/mach/serial_at91.h
new file mode 100644
index 000000000000..55b317a89061
--- /dev/null
+++ b/trunk/arch/avr32/include/asm/mach/serial_at91.h
@@ -0,0 +1,33 @@
+/*
+ *  linux/include/asm-arm/mach/serial_at91.h
+ *
+ *  Based on serial_sa1100.h  by Nicolas Pitre
+ *
+ *  Copyright (C) 2002 ATMEL Rousset
+ *
+ *  Low level machine dependent UART functions.
+ */
+
+struct uart_port;
+
+/*
+ * This is a temporary structure for registering these
+ * functions; it is intended to be discarded after boot.
+ */
+struct atmel_port_fns {
+	void	(*set_mctrl)(struct uart_port *, u_int);
+	u_int	(*get_mctrl)(struct uart_port *);
+	void	(*enable_ms)(struct uart_port *);
+	void	(*pm)(struct uart_port *, u_int, u_int);
+	int	(*set_wake)(struct uart_port *, u_int);
+	int	(*open)(struct uart_port *);
+	void	(*close)(struct uart_port *);
+};
+
+#if defined(CONFIG_SERIAL_ATMEL)
+void atmel_register_uart_fns(struct atmel_port_fns *fns);
+#else
+#define atmel_register_uart_fns(fns) do { } while (0)
+#endif
+
+
diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c
index a6134c94a9fc..3d7e1ee2fa57 100644
--- a/trunk/drivers/tty/serial/atmel_serial.c
+++ b/trunk/drivers/tty/serial/atmel_serial.c
@@ -43,6 +43,7 @@
 #include <asm/io.h>
 #include <asm/ioctls.h>
 
+#include <asm/mach/serial_at91.h>
 #include <mach/board.h>
 
 #ifdef CONFIG_ARM
@@ -1512,6 +1513,23 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
 	}
 }
 
+/*
+ * Register board-specific modem-control line handlers.
+ */
+void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
+{
+	if (fns->enable_ms)
+		atmel_pops.enable_ms = fns->enable_ms;
+	if (fns->get_mctrl)
+		atmel_pops.get_mctrl = fns->get_mctrl;
+	if (fns->set_mctrl)
+		atmel_pops.set_mctrl = fns->set_mctrl;
+	atmel_open_hook		= fns->open;
+	atmel_close_hook	= fns->close;
+	atmel_pops.pm		= fns->pm;
+	atmel_pops.set_wake	= fns->set_wake;
+}
+
 struct platform_device *atmel_default_console_device;	/* the serial console device */
 
 #ifdef CONFIG_SERIAL_ATMEL_CONSOLE
diff --git a/trunk/drivers/tty/serial/sa1100.c b/trunk/drivers/tty/serial/sa1100.c
index ecc1e16be623..2ca5959ec3fa 100644
--- a/trunk/drivers/tty/serial/sa1100.c
+++ b/trunk/drivers/tty/serial/sa1100.c
@@ -29,7 +29,6 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -40,6 +39,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
+#include <asm/mach/serial_sa1100.h>
 
 /* We've been assigned a range on the "Low-density serial ports" major */
 #define SERIAL_SA1100_MAJOR	204
diff --git a/trunk/drivers/usb/gadget/pxa25x_udc.c b/trunk/drivers/usb/gadget/pxa25x_udc.c
index d4ca9f1f7f24..8efbf08c3561 100644
--- a/trunk/drivers/usb/gadget/pxa25x_udc.c
+++ b/trunk/drivers/usb/gadget/pxa25x_udc.c
@@ -29,7 +29,6 @@
 #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>
@@ -60,6 +59,9 @@
 #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.