diff options
| author | Linus Torvalds | 2009-12-10 04:45:58 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-10 04:45:58 +0100 |
| commit | 6bb951a0a6212486a3bab3d765c32295f46f24c2 (patch) | |
| tree | 669eee646735ec3029d4c5fd43cef494758b428e /arch/arm/plat-s3c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff) | |
| parent | ARM: S3C24XX: DMA: Use valid index when accessing array (diff) | |
| download | kernel-qcow2-linux-6bb951a0a6212486a3bab3d765c32295f46f24c2.tar.gz kernel-qcow2-linux-6bb951a0a6212486a3bab3d765c32295f46f24c2.tar.xz kernel-qcow2-linux-6bb951a0a6212486a3bab3d765c32295f46f24c2.zip | |
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) return ret; } -static int s3c_pwm_remove(struct platform_device *pdev) +static int __devexit s3c_pwm_remove(struct platform_device *pdev) { struct pwm_device *pwm = platform_get_drvdata(pdev); |