diff --git a/[refs] b/[refs] index de6f59c9b99b..14edbfcb5d11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f7426c0e16dba118aa1b18f3c97c3d7adfb7540 +refs/heads/master: 74121b699c7142cbf11b01212512a1824fbd5f19 diff --git a/trunk/arch/sparc64/kernel/vio.c b/trunk/arch/sparc64/kernel/vio.c index 9ae1f61d4db9..491223a6628f 100644 --- a/trunk/arch/sparc64/kernel/vio.c +++ b/trunk/arch/sparc64/kernel/vio.c @@ -235,7 +235,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp, break; } if (!id) { - printk(KERN_ERR "VIO: vdc-prot lacks parent " + printk(KERN_ERR "VIO: vdc-port lacks parent " "cfg-handle.\n"); return NULL; }