Merge branch 'linus' into core/iommu

2009-01-11 00:51:06 +01:00
parent c299030765 3d14bdad40
commit 0811a433c6
3455 changed files with 642819 additions and 75167 deletions
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(bad_dma_address);
   be probably a smaller DMA mask, but this is bug-to-bug compatible
   to older i386. */
 struct device x86_dma_fallback_dev = {
-	.bus_id = "fallback device",
+	.init_name = "fallback device",
 	.coherent_dma_mask = DMA_32BIT_MASK,
 	.dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,
 };