diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:33:50 -0500 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:33:50 -0500 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /arch/arm/mach-omap2/emu.c | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
| download | olio-linux-3.10-dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4.tar.xz olio-linux-3.10-dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4.zip | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/emu.c')
| -rw-r--r-- | arch/arm/mach-omap2/emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c index b3566f68a55..cbeaca2d769 100644 --- a/arch/arm/mach-omap2/emu.c +++ b/arch/arm/mach-omap2/emu.c @@ -47,4 +47,4 @@ static int __init emu_init(void) return 0; } -subsys_initcall(emu_init); +omap_subsys_initcall(emu_init); |