diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 00:57:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 00:57:23 -0400 |
| commit | 5694ca9f46202c50df525472abb6d8c1dee4f8eb (patch) | |
| tree | c16a4ff264b024ea2017a88a29d8f03695bd2656 /drivers/serial/sunsab.c | |
| parent | 76aba64a6608fcaa02c715e93c572192f3621195 (diff) | |
| parent | ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64] Fix PSYCHO PCI controler init.
[SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources()
[SERIAL] sunsab: Fix significant typo in sab_probe()
[SERIAL] sunsu: Report keyboard and mouse ports in kernel log.
[SPARC64]: Make sure IRQs are disabled properly during early boot.
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 0dbd4df44c05..979497f108c8 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -1052,7 +1052,7 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id * | |||
| 1052 | if (err) | 1052 | if (err) |
| 1053 | return err; | 1053 | return err; |
| 1054 | 1054 | ||
| 1055 | err = sunsab_init_one(&up[0], op, 0, | 1055 | err = sunsab_init_one(&up[1], op, 0, |
| 1056 | (inst * 2) + 1); | 1056 | (inst * 2) + 1); |
| 1057 | if (err) { | 1057 | if (err) { |
| 1058 | of_iounmap(up[0].port.membase, | 1058 | of_iounmap(up[0].port.membase, |