From: Russell King Date: Tue, 20 Feb 2007 15:23:57 +0000 (+0000) Subject: [ARM] Fix jornada720 build errors X-Git-Tag: v2.6.21-rc1~50^2^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4f2849e49cbaf8373163211bb811a8457b46cc4e;p=linux-2.6-omap-h63xx.git [ARM] Fix jornada720 build errors kernel/built-in.o: In function `pm_suspend': utsname_sysctl.c:(.text+0x23008): multiple definition of `pm_suspend' arch/arm/mach-sa1100/built-in.o:arch/arm/mach-sa1100/sleep.S:(.text+0xf68): first defined here arm-linux-ld: Warning: size of symbol `pm_suspend' changed from 20 in arch/arm/mach-sa1100/built-in.o to 44 in kernel/built-in.o Signed-off-by: Russell King --- diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 54ecdaa373d..64067cd58d3 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -231,12 +231,6 @@ static struct platform_device *devices[] __initdata = { &s1d13xxxfb_device, }; -/* a stub for now, we theoretically cannot suspend without a flashboard */ -int pm_suspend(suspend_state_t state) -{ - return -1; -} - static int __init jornada720_init(void) { int ret = -ENODEV;