Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d30c7369666ff1687f668ea5a65b99d1f7e06144
Commit:     d30c7369666ff1687f668ea5a65b99d1f7e06144
Parent:     0695de32579edefd137f7e9fa056e6d204011d70
Author:     Tony Lindgren <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 15:50:16 2007 -0700
Committer:  Tony Lindgren <[EMAIL PROTECTED]>
CommitDate: Thu May 10 15:50:16 2007 -0700

    ARM: OMAP: Remove old PM_SUSPEND_DISK
    
    Remove old PM_SUSPEND_DISK. Also some minor cosmetic
    clean-up.
    
    Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
---
 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 6f4ea4b..8caee68 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;
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to