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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
s3c2440.c
diff --git
a/arch/arm/mach-s3c2410/s3c2440.c
b/arch/arm/mach-s3c2410/s3c2440.c
index
d4c8281
..
b7fe6d9
100644
(file)
--- a/
arch/arm/mach-s3c2410/s3c2440.c
+++ b/
arch/arm/mach-s3c2410/s3c2440.c
@@
-26,8
+26,9
@@
#include <linux/list.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/timer.h>
#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/sysdev.h>
#include <linux/sysdev.h>
+#include <linux/clk.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@
-36,7
+37,6
@@
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/hardware/clock.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-serial.h>
@@
-151,7
+151,7
@@
void __init s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
#ifdef CONFIG_PM
#ifdef CONFIG_PM
-struct sleep_save s3c2440_sleep[] = {
+st
atic st
ruct sleep_save s3c2440_sleep[] = {
SAVE_ITEM(S3C2440_DSC0),
SAVE_ITEM(S3C2440_DSC1),
SAVE_ITEM(S3C2440_GPJDAT),
SAVE_ITEM(S3C2440_DSC0),
SAVE_ITEM(S3C2440_DSC1),
SAVE_ITEM(S3C2440_GPJDAT),
@@
-260,7
+260,7
@@
void __init s3c2440_init_clocks(int xtal)
* as a driver which may support both 2410 and 2440 may try and use it.
*/
* as a driver which may support both 2410 and 2440 may try and use it.
*/
-int __init s3c2440_core_init(void)
+
static
int __init s3c2440_core_init(void)
{
return sysdev_class_register(&s3c2440_sysclass);
}
{
return sysdev_class_register(&s3c2440_sysclass);
}