summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-18 10:56:11 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-18 10:56:11 +1000
commite8bfd0259d142536b960a947fbc13c20b0c201a9 (patch)
tree02b0817d0a99e77d46ba937100b318b60a182fec /drivers/serial
parentf142de252d54ea55019a3c1485d259babe150d39 (diff)
parent1ed31d6db90d51010545921e59d369d2f92b7ac2 (diff)
Merge remote branch 'powerpc/next'
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/mpsc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 55e113a0be03..6a9c6605666a 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -2071,6 +2071,7 @@ static int mpsc_drv_probe(struct platform_device *dev)
if (!(rc = mpsc_drv_map_regs(pi, dev))) {
mpsc_drv_get_platform_data(pi, dev, dev->id);
+ pi->port.dev = &dev->dev;
if (!(rc = mpsc_make_ready(pi))) {
spin_lock_init(&pi->tx_lock);