diff options
| author | Tony Lindgren <tony@atomide.com> | 2007-05-11 00:50:16 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2007-05-11 00:50:16 +0200 |
| commit | d30c7369666ff1687f668ea5a65b99d1f7e06144 (patch) | |
| tree | c3650161a9c81c48a92737d33d70029bc32b00d0 /arch | |
| parent | ARM: OMAP: Fix warning in dma.c (diff) | |
| download | linux-d30c7369666ff1687f668ea5a65b99d1f7e06144.tar.xz linux-d30c7369666ff1687f668ea5a65b99d1f7e06144.zip | |
ARM: OMAP: Remove old PM_SUSPEND_DISK
Remove old PM_SUSPEND_DISK. Also some minor cosmetic
clean-up.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 6f4ea4bda5e0..8caee68aa090 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -1,4 +1,3 @@ -//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text) /* * linux/arch/arm/mach-omap1/pm.c * @@ -377,7 +376,7 @@ void omap_pm_suspend(void) * Jump to assembly code. The processor will stay there * until wake up. */ - omap_sram_suspend(arg0, arg1); + omap_sram_suspend(arg0, arg1); /* * If we are here, processor is woken up! @@ -631,10 +630,6 @@ static int omap_pm_prepare(suspend_state_t state) case PM_SUSPEND_STANDBY: case PM_SUSPEND_MEM: break; - - case PM_SUSPEND_DISK: - return -ENOTSUPP; - default: return -EINVAL; } @@ -657,10 +652,6 @@ static int omap_pm_enter(suspend_state_t state) case PM_SUSPEND_MEM: omap_pm_suspend(); break; - - case PM_SUSPEND_DISK: - return -ENOTSUPP; - default: return -EINVAL; } |