diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /arch/ppc/mm/init.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/ppc/mm/init.c')
| -rw-r--r-- | arch/ppc/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index be02a7fec2b7..363c157e3617 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
| @@ -179,6 +179,7 @@ void free_initmem(void) | |||
| 179 | if (!have_of) | 179 | if (!have_of) |
| 180 | FREESEC(openfirmware); | 180 | FREESEC(openfirmware); |
| 181 | printk("\n"); | 181 | printk("\n"); |
| 182 | ppc_md.progress = NULL; | ||
| 182 | #undef FREESEC | 183 | #undef FREESEC |
| 183 | } | 184 | } |
| 184 | 185 | ||