diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-31 11:29:11 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-31 11:29:11 +0000 |
| commit | 8e123dfde5301965e1e7700e228b21c2652c2687 (patch) | |
| tree | 76fb35e139aaf894e4e020ae2e8ea6cfa287f4a0 /packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch | |
| parent | 3ba4190413ed7aaf3b1ad78abc1009394e219a01 (diff) | |
| parent | 566c8bb147d8ba79662edcd755883793e0c945f5 (diff) | |
merge of '55dbe512554ea028b2d4722048c4e9d4a958022c'
and '6aff048ce0e2244277e9b1398c4a400bdd758e30'
Diffstat (limited to 'packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch')
| -rw-r--r-- | packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch index e1491d6d49..409daf03e6 100644 --- a/packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch +++ b/packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch @@ -28,33 +28,3 @@ Index: git/arch/arm/common/sharpsl_pm.c dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n"); return 0; - arch/arm/common/sharpsl_pm.c | 3 +++ - include/asm-arm/hardware/sharpsl_pm.h | 1 + - 2 files changed, 4 insertions(+) - -Index: git/include/asm-arm/hardware/sharpsl_pm.h -=================================================================== ---- git.orig/include/asm-arm/hardware/sharpsl_pm.h 2006-10-31 16:09:33.000000000 +0000 -+++ git/include/asm-arm/hardware/sharpsl_pm.h 2006-11-07 22:08:41.000000000 +0000 -@@ -26,6 +26,7 @@ struct sharpsl_charger_machinfo { - void (*presuspend)(void); - void (*postsuspend)(void); - void (*earlyresume)(void); -+ void (*postresume)(void); - unsigned long (*read_devdata)(int); - #define SHARPSL_BATT_VOLT 1 - #define SHARPSL_BATT_TEMP 2 -Index: git/arch/arm/common/sharpsl_pm.c -=================================================================== ---- git.orig/arch/arm/common/sharpsl_pm.c 2006-11-07 22:03:48.000000000 +0000 -+++ git/arch/arm/common/sharpsl_pm.c 2006-11-07 22:04:20.000000000 +0000 -@@ -584,6 +584,9 @@ static int corgi_pxa_pm_enter(suspend_st - if (sharpsl_pm.machinfo->earlyresume) - sharpsl_pm.machinfo->earlyresume(); - -+ if (sharpsl_pm.machinfo->postresume) -+ sharpsl_pm.machinfo->postresume(); -+ - dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n"); - - return 0; |