Merge branch 'linus' into core/iommu

[mv-sheeva.git] / drivers / idle / i7300_idle.c

diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index fb176f6ef9f8a153f4c53c8787dbaef18af5862a..17e8ddd013347623c39d8ecb8e150b99aaa29094 100644 (file)
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -177,7 +177,7 @@ static int __init i7300_idle_ioat_selftest(u8 *ctl,
 }
 
 static struct device dummy_dma_dev = {
-       .bus_id = "fallback device",
+       .init_name = "fallback device",
        .coherent_dma_mask = DMA_64BIT_MASK,
        .dma_mask = &dummy_dma_dev.coherent_dma_mask,
 };