summaryrefslogtreecommitdiffstats
path: root/drivers/serial/pxa.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
commit94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch)
tree5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/serial/pxa.c
parent3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff)
parent1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff)
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/serial/pxa.c')
-rw-r--r--drivers/serial/pxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 8cc4cedadd9..16b2f9417af 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -39,7 +39,7 @@
#include <linux/circ_buf.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial_core.h>