diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /kernel/pm.c | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'kernel/pm.c')
| -rw-r--r-- | kernel/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pm.c b/kernel/pm.c index 0f3984bea..eb7c6f615 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/pm.h> -int pm_active = 0; +int pm_active; static spinlock_t pm_devs_lock = SPIN_LOCK_UNLOCKED; static LIST_HEAD(pm_devs); |