git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/soundcore' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c64xx
/
cpu.c
diff --git
a/arch/arm/plat-s3c64xx/cpu.c
b/arch/arm/plat-s3c64xx/cpu.c
index
19f68b5
..
b1fdd83
100644
(file)
--- a/
arch/arm/plat-s3c64xx/cpu.c
+++ b/
arch/arm/plat-s3c64xx/cpu.c
@@
-102,6
+102,11
@@
static struct map_desc s3c_iodesc[] __initdata = {
.pfn = __phys_to_pfn(S3C64XX_PA_MODEM),
.length = SZ_4K,
.type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)S3C_VA_WATCHDOG,
+ .pfn = __phys_to_pfn(S3C64XX_PA_WATCHDOG),
+ .length = SZ_4K,
+ .type = MT_DEVICE,
},
};