diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
| commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
| tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /include/asm-arm/arch-pxa/pm.h | |
| parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
| parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) | |
| download | kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.tar.gz kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.tar.xz kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-pxa/pm.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/pm.h b/include/asm-arm/arch-pxa/pm.h index 9d9f4b54b2c..261e5bc958d 100644 --- a/include/asm-arm/arch-pxa/pm.h +++ b/include/asm-arm/arch-pxa/pm.h @@ -10,7 +10,7 @@ #include <linux/suspend.h> struct pxa_cpu_pm_fns { - int save_size; + int save_count; void (*save)(unsigned long *); void (*restore)(unsigned long *); int (*valid)(suspend_state_t state); |