Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4f2849e49cbaf8373163211bb811a8457b46cc4e
Commit: 4f2849e49cbaf8373163211bb811a8457b46cc4e
Parent: 6a32b935f8f8eb31877b73f76290ae051279df33
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 20 15:23:57 2007 +0000
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Feb 20 15:23:57 2007 +0000
[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 <[EMAIL PROTECTED]>
---
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 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
