summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 16:01:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 16:01:39 -0700
commit63d39fe88ffabbd82d9db42e9b603c58532fc918 (patch)
treebaa66eed1709d85406bc476cb468204968b5b512 /arch/arm
parent2c5362007bc0a46461a9d94958cdd53bb027004c (diff)
parent463b158aab247b600e4e93614b7b8f42a66331c9 (diff)
downloadblackbird-op-linux-63d39fe88ffabbd82d9db42e9b603c58532fc918.tar.gz
blackbird-op-linux-63d39fe88ffabbd82d9db42e9b603c58532fc918.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3477/1: ARM EABI: undefine removed syscalls [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/common-smdk.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c2440-clock.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/common-smdk.c b/arch/arm/mach-s3c2410/common-smdk.c
index f372fbda124e..c940890f621f 100644
--- a/arch/arm/mach-s3c2410/common-smdk.c
+++ b/arch/arm/mach-s3c2410/common-smdk.c
@@ -50,7 +50,7 @@ static struct mtd_partition smdk_default_nand_part[] = {
.offset = 0,
},
[1] = {
- .name = "S3C2410 flash parition 1",
+ .name = "S3C2410 flash partition 1",
.offset = 0,
.size = SZ_2M,
},
diff --git a/arch/arm/mach-s3c2410/s3c2440-clock.c b/arch/arm/mach-s3c2410/s3c2440-clock.c
index 57a15974d4b5..d7a30ed6c327 100644
--- a/arch/arm/mach-s3c2410/s3c2440-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2440-clock.c
@@ -139,7 +139,7 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
clkdivn = __raw_readl(S3C2410_CLKDIVN);
clkdivn |= S3C2440_CLKDIVN_UCLK;
- __raw_writel(camdivn, S3C2410_CLKDIVN);
+ __raw_writel(clkdivn, S3C2410_CLKDIVN);
mutex_unlock(&clocks_mutex);
}
OpenPOWER on IntegriCloud