git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-rx3715.c
diff --git
a/arch/arm/mach-s3c2410/mach-rx3715.c
b/arch/arm/mach-s3c2410/mach-rx3715.c
index
23d7c05
..
ecbcdf7
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/
arch/arm/mach-s3c2410/mach-rx3715.c
@@
-42,6
+42,7
@@
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-lcd.h>
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-lcd.h>
+#include <asm/arch/h1940.h>
#include <asm/arch/nand.h>
#include <asm/arch/fb.h>
#include <asm/arch/nand.h>
#include <asm/arch/fb.h>
@@
-224,7
+225,9
@@
static void __init rx3715_init_irq(void)
static void __init rx3715_init_machine(void)
{
static void __init rx3715_init_machine(void)
{
+ memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
s3c2410_pm_init();
s3c2410_pm_init();
+
s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
}
s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
}