merge of 425cf1b391611c169a1c3b78f1fe86df088902b9
[vuplus_openembedded] / packages / linux / linux-rp-2.6.18+git / sharpsl-pm-postresume-r1.patch
1  arch/arm/common/sharpsl_pm.c          |    3 +++
2  include/asm-arm/hardware/sharpsl_pm.h |    1 +
3  2 files changed, 4 insertions(+)
4
5 Index: git/include/asm-arm/hardware/sharpsl_pm.h
6 ===================================================================
7 --- git.orig/include/asm-arm/hardware/sharpsl_pm.h      2006-10-31 16:09:33.000000000 +0000
8 +++ git/include/asm-arm/hardware/sharpsl_pm.h   2006-11-07 22:08:41.000000000 +0000
9 @@ -26,6 +26,7 @@ struct sharpsl_charger_machinfo {
10         void (*presuspend)(void);
11         void (*postsuspend)(void);
12         void (*earlyresume)(void);
13 +       void (*postresume)(void);
14         unsigned long (*read_devdata)(int);
15  #define SHARPSL_BATT_VOLT       1
16  #define SHARPSL_BATT_TEMP       2
17 Index: git/arch/arm/common/sharpsl_pm.c
18 ===================================================================
19 --- git.orig/arch/arm/common/sharpsl_pm.c       2006-11-07 22:03:48.000000000 +0000
20 +++ git/arch/arm/common/sharpsl_pm.c    2006-11-07 22:04:20.000000000 +0000
21 @@ -584,6 +584,9 @@ static int corgi_pxa_pm_enter(suspend_st
22         if (sharpsl_pm.machinfo->earlyresume)
23                 sharpsl_pm.machinfo->earlyresume();
24  
25 +       if (sharpsl_pm.machinfo->postresume)
26 +               sharpsl_pm.machinfo->postresume();
27 +       
28         dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n");
29  
30         return 0;