Commit 4f2849e4 authored Feb 20, 2007 by Russell King Committed by Russell King Feb 20, 2007

[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 <rmk+kernel@arm.linux.org.uk>

parent 6a32b935

arch/arm/mach-sa1100/jornada720.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;