diff options
author | Tony Lindgren <tony@atomide.com> | 2012-01-20 05:31:52 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 05:31:52 -0800 |
commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /sound/soc/omap | |
parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
download | op-kernel-dev-967809bd7faf71ddc29c8081e0f21db8b201a0f4.zip op-kernel-dev-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.gz |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/ams-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index a67f437..da6e005 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -635,7 +635,7 @@ err: platform_device_put(ams_delta_audio_platform_device); return ret; } -module_init(ams_delta_module_init); +late_initcall(ams_delta_module_init); static void __exit ams_delta_module_exit(void) { |