diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-20 16:25:04 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-20 16:25:04 +0000 |
| commit | 040cac4381dad6ccdfc469947707801635b637f3 (patch) | |
| tree | 43baba065d1d11e16f6643c71f0058088cee27e1 /packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch | |
| parent | 38b93f84292c8c73dbe31a819af460a25c6366c5 (diff) | |
| parent | 4eb9df8f9417be05b68b75b697300bb2321e9968 (diff) | |
merge of '81438ff8d532d4511d52cc48caae759eaf02741c'
and '8e96e2bb9c496749e3561f9bbb1bd1de9ae3258e'
Diffstat (limited to 'packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch')
| -rw-r--r-- | packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch new file mode 100644 index 0000000000..409daf03e6 --- /dev/null +++ b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch @@ -0,0 +1,30 @@ + 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; |