diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:05:03 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:05:03 +0000 |
| commit | 235ecf4c59ebe13e065a40755d999fa9850b8179 (patch) | |
| tree | fc1048fe799b67413bb5716c1f0775f188500822 /sound | |
| parent | fb0b82b32ce17564bc64cede50bf4a3204eecc60 (diff) | |
| parent | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (diff) | |
Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
* 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
input: serio: ams-delta: toggle keyboard power over GPIO
omapfb: lcd_ams_delta: drive control lines over GPIO
MTD: NAND: ams-delta: use GPIO instead of custom I/O
LED: drop leds-ams-delta driver
ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
ARM: OMAP1: ams-delta: register latch dependent devices later
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 a67f4370bc9..da6e005c1c4 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) { |