diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /arch/arm/mach-s3c2410/pm.c | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'arch/arm/mach-s3c2410/pm.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index fe57d966a34..43e9a550a20 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c | |||
| @@ -58,7 +58,11 @@ unsigned long s3c_pm_flags; | |||
| 58 | 58 | ||
| 59 | /* cache functions from arch/arm/mm/proc-arm920.S */ | 59 | /* cache functions from arch/arm/mm/proc-arm920.S */ |
| 60 | 60 | ||
| 61 | #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH | ||
| 61 | extern void arm920_flush_kern_cache_all(void); | 62 | extern void arm920_flush_kern_cache_all(void); |
| 63 | #else | ||
| 64 | static void arm920_flush_kern_cache_all(void) { } | ||
| 65 | #endif | ||
| 62 | 66 | ||
| 63 | #define PFX "s3c24xx-pm: " | 67 | #define PFX "s3c24xx-pm: " |
| 64 | 68 | ||