diff options
| author | Russell King | 2010-10-19 23:06:36 +0200 |
|---|---|---|
| committer | Russell King | 2010-10-19 23:06:36 +0200 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/plat-samsung/adc.c | |
| parent | Merge branch 'hotplug' into devel (diff) | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| download | kernel-qcow2-linux-809b4e00baf006a990a73329ba381d536c6fa277.tar.gz kernel-qcow2-linux-809b4e00baf006a990a73329ba381d536c6fa277.tar.xz kernel-qcow2-linux-809b4e00baf006a990a73329ba381d536c6fa277.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/plat-samsung/adc.c')
| -rw-r--r-- | arch/arm/plat-samsung/adc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index 04d9521ddc9f..e8f2be2d67f2 100644 --- 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); |