diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-23 17:04:47 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-23 17:04:47 +0100 |
commit | f109ff7d107c2abd9201c58f7416e66bd75d6959 (patch) | |
tree | 2ca9483344acd06095018a092555d0667dea6106 /drivers/clk/clk-ppc-corenet.c | |
parent | dd8937c86f09f89b7ac0b68c3c38d960fb7f4c67 (diff) | |
parent | 281d1bbd34b734e4f22b30b6f3b673dda46a7470 (diff) |
Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-nightly
Diffstat (limited to 'drivers/clk/clk-ppc-corenet.c')
-rw-r--r-- | drivers/clk/clk-ppc-corenet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c index b6e6c85507a5..0a47d6f49cd6 100644 --- a/drivers/clk/clk-ppc-corenet.c +++ b/drivers/clk/clk-ppc-corenet.c @@ -291,7 +291,7 @@ static const struct of_device_id ppc_clk_ids[] __initconst = { {} }; -static struct platform_driver ppc_corenet_clk_driver __initdata = { +static struct platform_driver ppc_corenet_clk_driver = { .driver = { .name = "ppc_corenet_clock", .of_match_table = ppc_clk_ids, |