Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

* 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx51-babbage: fix esdhc cd/wp properties
  ARM: imx6: spin the cpu until hardware takes it down
  ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path

Also updates to Linux 3.6-rc2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 500e7f15f5c2..0a2ea317120a 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1131,9 +1131,6 @@ static int __init amd_iommu_init_pci(void)
                         break;
         }
 
-        /* Make sure ACS will be enabled */
-        pci_request_acs();
-
         ret = amd_iommu_init_devices();
 
         print_iommu_info();
@@ -1652,6 +1649,9 @@ static bool detect_ivrs(void)
 
         early_acpi_os_unmap_memory((char __iomem *)ivrs_base, ivrs_size);
 
+        /* Make sure ACS will be enabled during PCI probe */
+        pci_request_acs();
+
         return true;
 }