diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /arch/parisc/kernel | |
parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index ccd61b9567a6..df47895db828 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c | |||
@@ -2,7 +2,7 @@ | |||
2 | ** PARISC 1.1 Dynamic DMA mapping support. | 2 | ** PARISC 1.1 Dynamic DMA mapping support. |
3 | ** This implementation is for PA-RISC platforms that do not support | 3 | ** This implementation is for PA-RISC platforms that do not support |
4 | ** I/O TLBs (aka DMA address translation hardware). | 4 | ** I/O TLBs (aka DMA address translation hardware). |
5 | ** See Documentation/DMA-mapping.txt for interface definitions. | 5 | ** See Documentation/PCI/PCI-DMA-mapping.txt for interface definitions. |
6 | ** | 6 | ** |
7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company | 7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company |
8 | ** (c) Copyright 2000 Grant Grundler | 8 | ** (c) Copyright 2000 Grant Grundler |