[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>
This commit is contained in:
parent
6a32b935f8
commit
4f2849e49c
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue