From 9b2a35dd616a9fbed3e6cd4c1781f5230d118402 Mon Sep 17 00:00:00 2001 From: merge Date: Thu, 4 Dec 2008 09:33:45 +0000 Subject: MERGE-via-pending-tracking-hist-patch-andy-tracking-merge-brea pending-tracking-hist top was patch-andy-tracking-merge-brea / 2010fb7565e8239f893d3631c3b1ccc7766f26b9 ... parent commitmessage: From: Werner Almesberger PATCH-andy-tracking-merge-breakage-pending-tracking-fix.patch Fix merge breakage in pending-tracking. With this patch, 0b519f14e15365213924505e2e3019c1ff159aa9 builds for GTA02 and it even boots ! ;-) Signed-off-by: Werner Almesberger --- arch/arm/mach-s3c2440/mach-gta02.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s3c2440') diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 61713afb1f6..0b9611f636f 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1719,7 +1719,7 @@ static void __init gta02_machine_init(void) platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); - s3c2410_pm_init(); + s3c_pm_init(); /* Make sure the modem can wake us up */ set_irq_type(GTA02_IRQ_MODEM, IRQ_TYPE_EDGE_RISING); -- cgit v1.2.3