diff --git a/[refs] b/[refs]
index a28415590160..4d1e49bb845c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8dd49fa054814f365fcff8d72ca47e8afda9743
+refs/heads/master: bc49a661e6e82bfa8219c3d0a2e4dea51c847d23
diff --git a/trunk/drivers/serial/8250.h b/trunk/drivers/serial/8250.h
index 9225c82faeb8..b1b459efda52 100644
--- a/trunk/drivers/serial/8250.h
+++ b/trunk/drivers/serial/8250.h
@@ -16,11 +16,7 @@
  */
 
 #include <linux/config.h>
-
-int serial8250_register_port(struct uart_port *);
-void serial8250_unregister_port(int line);
-void serial8250_suspend_port(int line);
-void serial8250_resume_port(int line);
+#include <linux/serial_8250.h>
 
 struct old_serial_port {
 	unsigned int uart;
diff --git a/trunk/include/linux/serial_8250.h b/trunk/include/linux/serial_8250.h
index 3e3c1fa35b06..d8a023d804d4 100644
--- a/trunk/include/linux/serial_8250.h
+++ b/trunk/include/linux/serial_8250.h
@@ -14,6 +14,9 @@
 #include <linux/serial_core.h>
 #include <linux/device.h>
 
+/*
+ * This is the platform device platform_data structure
+ */
 struct plat_serial8250_port {
 	unsigned long	iobase;		/* io base address */
 	void __iomem	*membase;	/* ioremap cookie or NULL */
@@ -26,4 +29,17 @@ struct plat_serial8250_port {
 	unsigned int	flags;		/* UPF_* flags */
 };
 
+/*
+ * This should be used by drivers which want to register
+ * their own 8250 ports without registering their own
+ * platform device.  Using these will make your driver
+ * dependent on the 8250 driver.
+ */
+struct uart_port;
+
+int serial8250_register_port(struct uart_port *);
+void serial8250_unregister_port(int line);
+void serial8250_suspend_port(int line);
+void serial8250_resume_port(int line);
+
 #endif