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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
dev-wdt.c
diff --git
a/arch/arm/plat-samsung/dev-wdt.c
b/arch/arm/plat-samsung/dev-wdt.c
index
5efca87
..
019b5b8
100644
(file)
--- a/
arch/arm/plat-samsung/dev-wdt.c
+++ b/
arch/arm/plat-samsung/dev-wdt.c
@@
-21,7
+21,7
@@
static struct resource s3c_wdt_resource[] = {
[0] = {
.start = S3C_PA_WDT,
- .end = S3C_PA_WDT + SZ_1
M - 1
,
+ .end = S3C_PA_WDT + SZ_1
K
,
.flags = IORESOURCE_MEM,
},
[1] = {