diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /arch/m68knommu | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c index e4c233eef195..06e538d1be3a 100644 --- a/arch/m68knommu/mm/init.c +++ b/arch/m68knommu/mm/init.c | |||
| @@ -136,7 +136,7 @@ void paging_init(void) | |||
| 136 | #endif | 136 | #endif |
| 137 | 137 | ||
| 138 | { | 138 | { |
| 139 | unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; | 139 | unsigned long zones_size[MAX_NR_ZONES] = {0, }; |
| 140 | 140 | ||
| 141 | zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; | 141 | zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; |
| 142 | zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; | 142 | zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; |