git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
adc.c
diff --git
a/arch/arm/plat-samsung/adc.c
b/arch/arm/plat-samsung/adc.c
index
04d9521
..
e8f2be2
100644
(file)
--- a/
arch/arm/plat-samsung/adc.c
+++ b/
arch/arm/plat-samsung/adc.c
@@
-435,7
+435,6
@@
static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)
static int s3c_adc_resume(struct platform_device *pdev)
{
struct adc_device *adc = platform_get_drvdata(pdev);
- unsigned long flags;
clk_enable(adc->clk);
enable_irq(adc->irq);