diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-18 02:00:49 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-18 02:00:49 +0400 |
| commit | a4581b35e1bc80becf240238bc787a5ec2727db0 (patch) | |
| tree | 34cbf36101639403a766e74deb36e7015d871b39 /arch/arm/mach-mxs/mach-m28evk.c | |
| parent | f940b88d3a57594289455ea99a93a8ddc5c4af06 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
| download | linux-a4581b35e1bc80becf240238bc787a5ec2727db0.tar.xz | |
Merge commit 'v3.2-rc6' into fbdev-next
Diffstat (limited to 'arch/arm/mach-mxs/mach-m28evk.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-m28evk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c index 3b1681e4f49a..6b00577b7025 100644 --- a/arch/arm/mach-mxs/mach-m28evk.c +++ b/arch/arm/mach-mxs/mach-m28evk.c @@ -361,6 +361,6 @@ static struct sys_timer m28evk_timer = { MACHINE_START(M28EVK, "DENX M28 EVK") .map_io = mx28_map_io, .init_irq = mx28_init_irq, - .init_machine = m28evk_init, .timer = &m28evk_timer, + .init_machine = m28evk_init, MACHINE_END |