diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /drivers/acpi/scan.c | |
parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
download | linux-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.gz linux-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.bz2 linux-38f0ad7c90c2b2091e7d8689dde294fef27db68b.zip |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index b14ac46948c9..27da63061e11 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2042,6 +2042,7 @@ int __init acpi_scan_init(void) acpi_lpss_init(); acpi_container_init(); acpi_memory_hotplug_init(); + acpi_dock_init(); mutex_lock(&acpi_scan_lock); /* |