diff --git a/[refs] b/[refs]
index 917f642aba78..4ffb0730aaad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7554c3f0e378161fb6315160d6c3e23bf2de5869
+refs/heads/master: 5b22a3855127bb8221bc96e8e41064b3c5b2bf08
diff --git a/trunk/arch/x86_64/kernel/pci-nommu.c b/trunk/arch/x86_64/kernel/pci-nommu.c
index 3209adac3272..e41564975195 100644
--- a/trunk/arch/x86_64/kernel/pci-nommu.c
+++ b/trunk/arch/x86_64/kernel/pci-nommu.c
@@ -92,7 +92,8 @@ void __init no_iommu_init(void)
 	dma_ops = &nommu_dma_ops;
 	if (end_pfn > MAX_DMA32_PFN) {
 		printk(KERN_ERR
-		       "WARNING more than 4GB of memory but IOMMU disabled.\n"
-		       KERN_ERR "WARNING 32bit PCI may malfunction.\n");
+		       "WARNING more than 4GB of memory but IOMMU not compiled in.\n"
+		       KERN_ERR "WARNING 32bit PCI may malfunction.\n"
+		       KERN_ERR "You might want to enable CONFIG_GART_IOMMU\n");
 	}
 }