diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 08:31:52 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 08:31:52 -0500 |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /sound | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
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: | |||
| 635 | platform_device_put(ams_delta_audio_platform_device); | 635 | platform_device_put(ams_delta_audio_platform_device); |
| 636 | return ret; | 636 | return ret; |
| 637 | } | 637 | } |
| 638 | module_init(ams_delta_module_init); | 638 | late_initcall(ams_delta_module_init); |
| 639 | 639 | ||
| 640 | static void __exit ams_delta_module_exit(void) | 640 | static void __exit ams_delta_module_exit(void) |
| 641 | { | 641 | { |