diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:07:19 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:07:19 +0200 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/plat-samsung/dev-wdt.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff) | |
| parent | ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3 (diff) | |
| download | linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.xz linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
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 5efca87cddbd..019b5b8cf14c 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] = { |