diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
| commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
| tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /drivers/clk/clk-ppc-corenet.c | |
| parent | fe198e34a44ce7f27e39c303d62a754129938194 (diff) | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
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, |