Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 45a299f35617..e09d3cebb4fb 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1438,12 +1438,12 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         } else {
                 printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id,
+                       dev_name(&op->dev),
                        (unsigned long long) up[0].port.mapbase,
                        op->irqs[0], sunzilog_type(&up[0].port));
                 printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id,
+                       dev_name(&op->dev),
                        (unsigned long long) up[1].port.mapbase,
                        op->irqs[0], sunzilog_type(&up[1].port));
                 kbm_inst++;