diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
| commit | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (patch) | |
| tree | f2f8e838d36722d39d62eb7eec7a1b3ad29d0d5a /arch/i386/mm/init.c | |
| parent | c30c620ee1cc351bcc149c4280e1166998df0064 (diff) | |
| parent | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (diff) | |
Pull kconfig into release branch
Diffstat (limited to 'arch/i386/mm/init.c')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index c3b9905af2d5..1b1a1e66d099 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -432,7 +432,7 @@ static void __init pagetable_init (void) paravirt_pagetable_setup_done(pgd_base); } -#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP) +#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI) /* * Swap suspend & friends need this for resume because things like the intel-agp * driver might have split up a kernel 4MB mapping. |