diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /include/asm-i386/e820.h | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/e820.h')
| -rw-r--r-- | include/asm-i386/e820.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h index 43114c824608..cf67dbb1db79 100644 --- a/include/asm-i386/e820.h +++ b/include/asm-i386/e820.h | |||
| @@ -47,7 +47,7 @@ extern void e820_register_memory(void); | |||
| 47 | extern void limit_regions(unsigned long long size); | 47 | extern void limit_regions(unsigned long long size); |
| 48 | extern void print_memory_map(char *who); | 48 | extern void print_memory_map(char *who); |
| 49 | 49 | ||
| 50 | #if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) | 50 | #if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION) |
| 51 | extern void e820_mark_nosave_regions(void); | 51 | extern void e820_mark_nosave_regions(void); |
| 52 | #else | 52 | #else |
| 53 | static inline void e820_mark_nosave_regions(void) | 53 | static inline void e820_mark_nosave_regions(void) |