diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
| commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
| tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /drivers/pwm/pwm-bfin.c | |
| parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pwm/pwm-bfin.c')
| -rw-r--r-- | drivers/pwm/pwm-bfin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-bfin.c b/drivers/pwm/pwm-bfin.c index 5da8e185e838..7631ef194de7 100644 --- a/drivers/pwm/pwm-bfin.c +++ b/drivers/pwm/pwm-bfin.c | |||
| @@ -139,7 +139,7 @@ static int bfin_pwm_probe(struct platform_device *pdev) | |||
| 139 | return 0; | 139 | return 0; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | static int __devexit bfin_pwm_remove(struct platform_device *pdev) | 142 | static int bfin_pwm_remove(struct platform_device *pdev) |
| 143 | { | 143 | { |
| 144 | struct bfin_pwm_chip *pwm = platform_get_drvdata(pdev); | 144 | struct bfin_pwm_chip *pwm = platform_get_drvdata(pdev); |
| 145 | 145 | ||
| @@ -151,7 +151,7 @@ static struct platform_driver bfin_pwm_driver = { | |||
| 151 | .name = "bfin-pwm", | 151 | .name = "bfin-pwm", |
| 152 | }, | 152 | }, |
| 153 | .probe = bfin_pwm_probe, | 153 | .probe = bfin_pwm_probe, |
| 154 | .remove = __devexit_p(bfin_pwm_remove), | 154 | .remove = bfin_pwm_remove, |
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| 157 | module_platform_driver(bfin_pwm_driver); | 157 | module_platform_driver(bfin_pwm_driver); |