diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/i386/mm/init.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
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 3672e2ef51ae..12216b52e28b 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c | |||
| @@ -352,7 +352,7 @@ static void __init pagetable_init (void) | |||
| 352 | #endif | 352 | #endif |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | #if defined(CONFIG_PM_DISK) || defined(CONFIG_SOFTWARE_SUSPEND) | 355 | #ifdef CONFIG_SOFTWARE_SUSPEND |
| 356 | /* | 356 | /* |
| 357 | * Swap suspend & friends need this for resume because things like the intel-agp | 357 | * Swap suspend & friends need this for resume because things like the intel-agp |
| 358 | * driver might have split up a kernel 4MB mapping. | 358 | * driver might have split up a kernel 4MB mapping. |