diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
| commit | c2e1ff39c106ab026e3feb29c038855b7ed00393 (patch) | |
| tree | e0255b5b9aed8645edc4426f2d4972280910e065 /arch/arm/mach-sa1100/shannon.c | |
| parent | 456d3d42460c1fc20ba0d27442443fcd63aaac35 (diff) | |
| parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pull in Linus's tree to get the commits that blew away
ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so
that I can apply Stephen Rothwell's fix for that mis-merge.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-sa1100/shannon.c')
| -rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index ca8bf59b9047..5d33fc3108ef 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
| @@ -104,5 +104,6 @@ MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") | |||
| 104 | .init_irq = sa1100_init_irq, | 104 | .init_irq = sa1100_init_irq, |
| 105 | .timer = &sa1100_timer, | 105 | .timer = &sa1100_timer, |
| 106 | .init_machine = shannon_init, | 106 | .init_machine = shannon_init, |
| 107 | .init_late = sa11x0_init_late, | ||
| 107 | .restart = sa11x0_restart, | 108 | .restart = sa11x0_restart, |
| 108 | MACHINE_END | 109 | MACHINE_END |