summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-02-20 15:23:57 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-20 15:23:57 +0000
commit4f2849e49cbaf8373163211bb811a8457b46cc4e (patch)
tree2b694386edfafefdfef855d432297277cebf7615 /arch
parent6a32b935f8f8eb31877b73f76290ae051279df33 (diff)
downloadop-kernel-dev-4f2849e49cbaf8373163211bb811a8457b46cc4e.zip
op-kernel-dev-4f2849e49cbaf8373163211bb811a8457b46cc4e.tar.gz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-sa1100/jornada720.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 54ecdaa..64067cd 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;
OpenPOWER on IntegriCloud