diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /arch/ia64/kernel | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/pci-swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c index 285aae8431c6..53292abf846c 100644 --- a/arch/ia64/kernel/pci-swiotlb.c +++ b/arch/ia64/kernel/pci-swiotlb.c | |||
| @@ -41,7 +41,7 @@ struct dma_map_ops swiotlb_dma_ops = { | |||
| 41 | void __init swiotlb_dma_init(void) | 41 | void __init swiotlb_dma_init(void) |
| 42 | { | 42 | { |
| 43 | dma_ops = &swiotlb_dma_ops; | 43 | dma_ops = &swiotlb_dma_ops; |
| 44 | swiotlb_init(); | 44 | swiotlb_init(1); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | void __init pci_swiotlb_init(void) | 47 | void __init pci_swiotlb_init(void) |
| @@ -51,7 +51,7 @@ void __init pci_swiotlb_init(void) | |||
| 51 | swiotlb = 1; | 51 | swiotlb = 1; |
| 52 | printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n"); | 52 | printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n"); |
| 53 | machvec_init("dig"); | 53 | machvec_init("dig"); |
| 54 | swiotlb_init(); | 54 | swiotlb_init(1); |
| 55 | dma_ops = &swiotlb_dma_ops; | 55 | dma_ops = &swiotlb_dma_ops; |
| 56 | #else | 56 | #else |
| 57 | panic("Unable to find Intel IOMMU"); | 57 | panic("Unable to find Intel IOMMU"); |