diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 10:58:10 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 10:58:10 +0100 |
| commit | 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e (patch) | |
| tree | cd6d6433f1c80475f36b94b7432923b4d4b7b660 /arch/arm/mach-mx3/cpu.c | |
| parent | becc670a1bda8f240a93e45d9794f9f79713ffdb (diff) | |
| parent | a8dfb6462a033984b99fee4122fe0799a31f5bb4 (diff) | |
| download | op-kernel-dev-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.zip op-kernel-dev-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.tar.gz | |
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx3/cpu.c')
| -rw-r--r-- | arch/arm/mach-mx3/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/cpu.c b/arch/arm/mach-mx3/cpu.c index db82880..861afe0 100644 --- a/arch/arm/mach-mx3/cpu.c +++ b/arch/arm/mach-mx3/cpu.c @@ -41,7 +41,7 @@ void __init mx31_read_cpu_rev(void) u32 i, srev; /* read SREV register from IIM module */ - srev = __raw_readl(IO_ADDRESS(IIM_BASE_ADDR) + MXC_IIMSREV); + srev = __raw_readl(IO_ADDRESS(IIM_BASE_ADDR + MXC_IIMSREV)); for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) if (srev == mx31_cpu_type[i].srev) { |
