diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 10:59:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 10:59:04 +0200 |
| commit | 063e04776172f93b16a5eefd5661a340c1126513 (patch) | |
| tree | 19cb1623631c8cc5dcf0d91f4731feec7cbefa04 /arch/arm/mach-sa1100/hackkit.c | |
| parent | 59cd358a7a5b2f6b61faa01dae6cfda3830ac62a (diff) | |
| parent | 731a7378b81c2f5fa88ca1ae20b83d548d5613dc (diff) | |
| download | linux-063e04776172f93b16a5eefd5661a340c1126513.tar.gz linux-063e04776172f93b16a5eefd5661a340c1126513.tar.xz linux-063e04776172f93b16a5eefd5661a340c1126513.zip | |
Merge branch 'linus' into perf/urgent
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the
merge window it's a good one to base further work off. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-sa1100/hackkit.c')
| -rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index 5535475bf583..7f86bd911826 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c @@ -199,5 +199,6 @@ MACHINE_START(HACKKIT, "HackKit Cpu Board") .init_irq = sa1100_init_irq, .timer = &sa1100_timer, .init_machine = hackkit_init, + .init_late = sa11x0_init_late, .restart = sa11x0_restart, MACHINE_END |