summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 09:26:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 09:26:17 -0700
commit86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0 (patch)
treedadb5d86c9f05bdbfe3180c3b307630c08f721b3 /drivers/serial
parent3b89f56783a4ef796190ef1192c25e72e0b986b6 (diff)
parent5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc (diff)
downloadlinux-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.tar.gz
linux-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.tar.bz2
linux-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.zip
Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6: spi.h: missing kernel-doc notation, please fix of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers of: Fix missing includes ata: update for of_device to platform_device replacement microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node microblaze: Fix of/address: Merge all of the bus translation code booting-without-of: Remove nonexistent chapters from TOC, fix numbering
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/of_serial.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 659a695bdad6..2af8fd113123 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -14,11 +14,10 @@
#include <linux/slab.h>
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
+#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/nwpserial.h>
-#include <asm/prom.h>
-
struct of_serial_info {
int type;
int line;