diff options
| author | Michal Marek <[email protected]> | 2013-02-25 21:50:05 +0100 |
|---|---|---|
| committer | Michal Marek <[email protected]> | 2013-02-25 21:51:57 +0100 |
| commit | e3900e74f26fc924c8e9e2a922bd40369b0bb517 (patch) | |
| tree | 6e868575d346032ba9408f350c6e5369e0e52b0d /drivers/pwm/pwm-imx.c | |
| parent | 62dc989921df2a98d1a73aacd085abe941cb9828 (diff) | |
| parent | 02f3e53a131c8aa3fe3c954058f1add5beeae621 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
Diffstat (limited to 'drivers/pwm/pwm-imx.c')
| -rw-r--r-- | drivers/pwm/pwm-imx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 8a5d3ae2946a..65a86bdeabed 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -231,11 +231,11 @@ static const struct of_device_id imx_pwm_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, imx_pwm_dt_ids); -static int __devinit imx_pwm_probe(struct platform_device *pdev) +static int imx_pwm_probe(struct platform_device *pdev) { const struct of_device_id *of_id = of_match_device(imx_pwm_dt_ids, &pdev->dev); - struct imx_pwm_data *data; + const struct imx_pwm_data *data; struct imx_chip *imx; struct resource *r; int ret = 0; @@ -290,7 +290,7 @@ static int __devinit imx_pwm_probe(struct platform_device *pdev) return 0; } -static int __devexit imx_pwm_remove(struct platform_device *pdev) +static int imx_pwm_remove(struct platform_device *pdev) { struct imx_chip *imx; @@ -307,7 +307,7 @@ static struct platform_driver imx_pwm_driver = { .of_match_table = of_match_ptr(imx_pwm_dt_ids), }, .probe = imx_pwm_probe, - .remove = __devexit_p(imx_pwm_remove), + .remove = imx_pwm_remove, }; module_platform_driver(imx_pwm_driver); |