diff options
author | Tony Lindgren <tony@atomide.com> | 2012-03-01 15:20:00 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-01 15:20:00 -0800 |
commit | 42392762149cba0a74c1c5b1b1bb868d86e62383 (patch) | |
tree | 3be8e3cbb4f09749a2e51d1fa162afd2181e19e6 /sound | |
parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) | |
parent | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (diff) | |
download | linux-42392762149cba0a74c1c5b1b1bb868d86e62383.tar.gz linux-42392762149cba0a74c1c5b1b1bb868d86e62383.tar.bz2 linux-42392762149cba0a74c1c5b1b1bb868d86e62383.zip |
Merge branch 'omap1' into ams-delta
Diffstat (limited to 'sound')
-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 a67f4370bc9f..da6e005c1c41 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) { |