]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] Fix jornada720 build errors
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Feb 2007 15:23:57 +0000 (15:23 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Feb 2007 15:23:57 +0000 (15:23 +0000)
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 <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/jornada720.c

index 54ecdaa373d6d4b8feeff7a445783daeabc1793a..64067cd58d36e075cd7fede2ddbdb48e2d715f1e 100644 (file)
@@ -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;