diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:45:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:45:58 -0500 |
| commit | 6bb951a0a6212486a3bab3d765c32295f46f24c2 (patch) | |
| tree | 669eee646735ec3029d4c5fd43cef494758b428e /arch/arm/plat-s3c | |
| parent | e49aedb594dc9cd4add2f0fd7360952c11017532 (diff) | |
| parent | 947a2462792a89b8aa168a1108288e0d0ae36d12 (diff) | |
Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux
* 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: DMA: Use valid index when accessing array
ARM: S3C: move s3c_pwm_remove to .devexit.text
ARM: S3C24XX: Export s3c24xx_set_fiq for modules.
ARM: S3C: move s3c_adc_remove to .devexit.text
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/pwm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/pwm.c b/arch/arm/plat-s3c/pwm.c index 4fdc5b307fd2..ef019f27b67d 100644 --- a/arch/arm/plat-s3c/pwm.c +++ b/arch/arm/plat-s3c/pwm.c | |||
| @@ -368,7 +368,7 @@ static int s3c_pwm_probe(struct platform_device *pdev) | |||
| 368 | return ret; | 368 | return ret; |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | static int s3c_pwm_remove(struct platform_device *pdev) | 371 | static int __devexit s3c_pwm_remove(struct platform_device *pdev) |
| 372 | { | 372 | { |
| 373 | struct pwm_device *pwm = platform_get_drvdata(pdev); | 373 | struct pwm_device *pwm = platform_get_drvdata(pdev); |
| 374 | 374 | ||