git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c24xx
/
adc.c
diff --git
a/arch/arm/plat-s3c24xx/adc.c
b/arch/arm/plat-s3c24xx/adc.c
index df47322492d55b0dfa24f1f4912bd19968264c2a..ce47627f3368f556b22f0694e7de68325a7e074d 100644
(file)
--- a/
arch/arm/plat-s3c24xx/adc.c
+++ b/
arch/arm/plat-s3c24xx/adc.c
@@
-365,7
+365,7
@@
static int s3c_adc_probe(struct platform_device *pdev)
return ret;
}
-static int s3c_adc_remove(struct platform_device *pdev)
+static int
__devexit
s3c_adc_remove(struct platform_device *pdev)
{
struct adc_device *adc = platform_get_drvdata(pdev);