diff options
| author | Ingo Molnar | 2009-01-11 00:51:06 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-01-11 00:51:06 +0100 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/ia64/kernel/pci-dma.c | |
| parent | convert to use generic dma_map_ops struct, cleanup (diff) | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-0811a433c61e85f895018239c4466a36311cd5de.tar.gz kernel-qcow2-linux-0811a433c61e85f895018239c4466a36311cd5de.tar.xz kernel-qcow2-linux-0811a433c61e85f895018239c4466a36311cd5de.zip | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
| -rw-r--r-- | arch/ia64/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index b30209ec8c6e..a647f116a155 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c @@ -36,7 +36,7 @@ int force_iommu __read_mostly; be probably a smaller DMA mask, but this is bug-to-bug compatible to i386. */ struct device fallback_dev = { - .bus_id = "fallback device", + .init_name = "fallback device", .coherent_dma_mask = DMA_32BIT_MASK, .dma_mask = &fallback_dev.coherent_dma_mask, }; |