diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:28:28 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:28:28 +0900 |
| commit | 5614e7725856ea383f458377980298111439e0fb (patch) | |
| tree | 82560034c3a17ee18073420406ba1228935e2967 /drivers/clk/qcom/reset.h | |
| parent | 522566376a3f8373fbd5ff75bb8a7a2da701c1a7 (diff) | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-5614e7725856ea383f458377980298111439e0fb.tar.bz2 | |
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/qcom/reset.h')
| -rw-r--r-- | drivers/clk/qcom/reset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h index 0e11e2130f97..cda877927d43 100644 --- a/drivers/clk/qcom/reset.h +++ b/drivers/clk/qcom/reset.h @@ -32,6 +32,6 @@ struct qcom_reset_controller { #define to_qcom_reset_controller(r) \ container_of(r, struct qcom_reset_controller, rcdev); -extern struct reset_control_ops qcom_reset_ops; +extern const struct reset_control_ops qcom_reset_ops; #endif |