diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-22 16:27:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-22 16:27:17 +0200 |
| commit | 69c1f05379a34786da96d0fdedc111cdcdecdf6f (patch) | |
| tree | 74a0cde11fbc619c227af89e0757036ab20323d0 /drivers/clk/versatile/clk-vexpress-osc.c | |
| parent | staging/skein: variable/member name cleanup (diff) | |
| parent | Linux 3.15-rc6 (diff) | |
| download | linux-69c1f05379a34786da96d0fdedc111cdcdecdf6f.tar.xz linux-69c1f05379a34786da96d0fdedc111cdcdecdf6f.zip | |
Merge 3.15-rc6 into staging-next.
This resolves the conflicts in the files:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/versatile/clk-vexpress-osc.c')
| -rw-r--r-- | drivers/clk/versatile/clk-vexpress-osc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c index a535c7bf8574..422391242b39 100644 --- a/drivers/clk/versatile/clk-vexpress-osc.c +++ b/drivers/clk/versatile/clk-vexpress-osc.c @@ -100,6 +100,8 @@ void __init vexpress_osc_of_setup(struct device_node *node) struct clk *clk; u32 range[2]; + vexpress_sysreg_of_early_init(); + osc = kzalloc(sizeof(*osc), GFP_KERNEL); if (!osc) return; |