Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / tty / serial / of_serial.c

diff --git a/drivers/serial/of_serial.c b/drivers/tty/serial/of_serial.c
similarity index 99%
rename from drivers/serial/of_serial.c
rename to drivers/tty/serial/of_serial.c
index 17849dcb9adc7e0e5090231192eef1778faeb8bb..5c7abe4c94dd4360de8c3ac26b9efd74af4a9867 100644 (file)
--- a/drivers/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -15,6 +15,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/nwpserial.h>