| commit | 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Oct 20 11:37:58 2008 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Oct 20 11:37:58 2008 +0900 |
| tree | c730bca14d2c6ea8b5e8778e15bd1c219c554d4b | |
| parent | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d [diff] [blame] |
sh: Fix up some merge damage. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 836e80d..5767f0a 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c
@@ -282,7 +282,7 @@ printk("initrd extends beyond end of memory " "(0x%08lx > 0x%08lx)\ndisabling initrd\n", initrd_start_phys + INITRD_SIZE, - PFN_PHYS(max_low_pfn)); + (unsigned long)PFN_PHYS(max_low_pfn)); initrd_start = 0; } }