diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-13 09:59:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-13 09:59:32 -0700 |
| commit | c931488cc4619eecfe68a2f046b5898fddc2f904 (patch) | |
| tree | b92e43b7cbae6e7128ca6d7831d06e63989f2a31 /arch/arm/mach-s3c2410/s3c2440.c | |
| parent | aac372de6bde03168b833b4db1346a2c34a016c6 (diff) | |
| parent | 3a8f675c40ba2d04e4fff6710db3da763436269f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2440.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c index d4c8281b55f..833fa36bce0 100644 --- a/arch/arm/mach-s3c2410/s3c2440.c +++ b/arch/arm/mach-s3c2410/s3c2440.c @@ -151,7 +151,7 @@ void __init s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no) #ifdef CONFIG_PM -struct sleep_save s3c2440_sleep[] = { +static struct sleep_save s3c2440_sleep[] = { 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. */ -int __init s3c2440_core_init(void) +static int __init s3c2440_core_init(void) { return sysdev_class_register(&s3c2440_sysclass); } |