diff --git a/[refs] b/[refs] index d5e0d9790a04..884622178b79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd3c7548b98bcefd3b21a9c3a2b1d584933467cc +refs/heads/master: 686ea5851e776a85b8bebdc83a8e60c49c1924b3 diff --git a/trunk/drivers/clk/clk-bcm2835.c b/trunk/drivers/clk/clk-bcm2835.c index 67ad16b20b81..59e0fd8016bf 100644 --- a/trunk/drivers/clk/clk-bcm2835.c +++ b/trunk/drivers/clk/clk-bcm2835.c @@ -55,5 +55,5 @@ void __init bcm2835_init_clocks(void) pr_err("uart1_pclk not registered\n"); ret = clk_register_clkdev(clk, NULL, "20215000.uart"); if (ret) - pr_err("uart0_pclk alias not registered\n"); + pr_err("uart1_pclk alias not registered\n"); }