diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 10:23:57 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 10:23:57 -0500 |
commit | 4f2849e49cbaf8373163211bb811a8457b46cc4e (patch) | |
tree | 2b694386edfafefdfef855d432297277cebf7615 /arch | |
parent | 6a32b935f8f8eb31877b73f76290ae051279df33 (diff) |
[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.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 54ecdaa373d6..64067cd58d36 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 = { | |||
231 | &s1d13xxxfb_device, | 231 | &s1d13xxxfb_device, |
232 | }; | 232 | }; |
233 | 233 | ||
234 | /* a stub for now, we theoretically cannot suspend without a flashboard */ | ||
235 | int pm_suspend(suspend_state_t state) | ||
236 | { | ||
237 | return -1; | ||
238 | } | ||
239 | |||
240 | static int __init jornada720_init(void) | 234 | static int __init jornada720_init(void) |
241 | { | 235 | { |
242 | int ret = -ENODEV; | 236 | int ret = -ENODEV; |