adm5120: merge 3.3 patches

[librecmc/librecmc.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / clock.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c b/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
index 1ada60fedd1c17c99fb1b5ebd1dd95a1e7acfac1..52ae64c419d11f87a2e23a01949db9d973f66deb 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/clock.c
@@ -33,7 +33,7 @@ static struct clk uart_clk = {
 
 struct clk *clk_get(struct device *dev, const char *id)
 {
-       char *name = dev_name(dev);
+       const char *name = dev_name(dev);
 
        if (!strcmp(name, "apb:uart0") || !strcmp(name, "apb:uart1"))
                return &uart_clk;