diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 05:30:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 05:30:31 +0200 |
| commit | 27a24cfa04c6f041c0191847d047f25e5627cd63 (patch) | |
| tree | c5377af546f914cc9ca665fd00c825204d61ef35 /drivers/acpi/scan.c | |
| parent | score: remove redundant kcore_list entries (diff) | |
| parent | ACPI / LPSS: register clock device for Lynxpoint DMA properly (diff) | |
| download | linux-27a24cfa04c6f041c0191847d047f25e5627cd63.tar.xz linux-27a24cfa04c6f041c0191847d047f25e5627cd63.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fixes from Vinod Koul:
"We have two patches from Andy & Rafael fixing the Lynxpoint dma"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
ACPI / LPSS: register clock device for Lynxpoint DMA properly
dma: acpi-dma: parse CSRT to extract additional resources
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index c1bc608339a6..44225cb15f3a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2043,7 +2043,6 @@ int __init acpi_scan_init(void) acpi_pci_link_init(); acpi_platform_init(); acpi_lpss_init(); - acpi_csrt_init(); acpi_container_init(); acpi_memory_hotplug_init(); |