Merge branch 'linus' into core/iommu

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 0d75c129b18a..f293a8df6828 100644
--- 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,
 };