diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-21 13:26:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-21 13:26:20 +1000 |
| commit | c8a86e82903055197e9e4d9ade976d81ee31877d (patch) | |
| tree | 0dfc7b3d6684db68f41677109c33bab930300c79 /drivers/serial/sunsu.c | |
| parent | cc9005eed86593f22560db6bc8cbe91a29ac1131 (diff) | |
| parent | b89dd580cb9a5660dda0ec9f21ff92a4181b3887 (diff) | |
Merge remote branch 'devicetree/next-devicetree'
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'drivers/serial/sunsu.c')
| -rw-r--r-- | drivers/serial/sunsu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index ffbf4553f665..5deafc8180b5 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1443,7 +1443,7 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m return -ENOMEM; } - up->port.irq = op->irqs[0]; + up->port.irq = op->archdata.irqs[0]; up->port.dev = &op->dev; |