diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 12:59:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 12:59:19 +0100 |
| commit | 749e4121d6ee7fd4495779730fbc6ae800d0317c (patch) | |
| tree | 9270ebabd9e3b57ef0427495ec9228f52454b608 /drivers/clk/at91/at91sam9x5.c | |
| parent | tty: serial: 21285: stop using the unused[] variable from struct uart_port (diff) | |
| parent | Linux 5.5-rc3 (diff) | |
| download | linux-749e4121d6ee7fd4495779730fbc6ae800d0317c.tar.xz linux-749e4121d6ee7fd4495779730fbc6ae800d0317c.zip | |
Merge 5.5-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/at91/at91sam9x5.c')
| -rw-r--r-- | drivers/clk/at91/at91sam9x5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c index 0855f3a80cc7..086cf0b4955c 100644 --- a/drivers/clk/at91/at91sam9x5.c +++ b/drivers/clk/at91/at91sam9x5.c @@ -146,7 +146,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, return; mainxtal_name = of_clk_get_parent_name(np, i); - regmap = syscon_node_to_regmap(np); + regmap = device_node_to_regmap(np); if (IS_ERR(regmap)) return; |