diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 23:56:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 23:56:42 +0100 |
| commit | 1de8cd3cb9f61e854e743c7210df43db517d4832 (patch) | |
| tree | 2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /drivers/idle/i7300_idle.c | |
| parent | 1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/idle/i7300_idle.c')
| -rw-r--r-- | drivers/idle/i7300_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index fb176f6ef9f..17e8ddd0133 100644 --- 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, }; |