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]: Kill sun4v virtual device layer.
  [SERIAL] sunhv: Convert to of_driver layer.
  [SPARC64]: Mask out top 8-bits in physical address when building resources.
  [SERIAL] sunsu: Missing return statement in su_probe().

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 72c86d0017f5..eabf477fee95 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1438,6 +1438,8 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
                 err = sunsu_kbd_ms_init(up);
                 if (err)
                         goto out_unmap;
+
+                return 0;
         }
 
         up->port.flags |= UPF_BOOT_AUTOCONF;