diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/arm/plat-samsung/dev-wdt.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
| download | kernel_samsung_smdk4412-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.zip kernel_samsung_smdk4412-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.tar.gz kernel_samsung_smdk4412-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/plat-samsung/dev-wdt.c')
| -rw-r--r-- | arch/arm/plat-samsung/dev-wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/dev-wdt.c b/arch/arm/plat-samsung/dev-wdt.c index 5efca87..019b5b8 100644 --- 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_1M - 1, + .end = S3C_PA_WDT + SZ_1K, .flags = IORESOURCE_MEM, }, [1] = { |