diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 19:33:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 19:33:51 -0500 |
| commit | 233ba2c5ffcf83f3dee3f4451724273f76cb7d8b (patch) | |
| tree | 559f7d1fdf647a03fc2b640168764e4a819d6576 /drivers | |
| parent | 001f3a48877a24afa7dfead84eb4678c68ab062e (diff) | |
| parent | aabb70dc23799e09d69d528756471d854f993136 (diff) | |
Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
PARISC fixes from James Bottomley:
"This is a set of build fixes to get the cross compiled architecture
testbeds building again"
* tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] don't unconditionally override CROSS_COMPILE for 64 bit.
[PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/iommu-helpers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/parisc/iommu-helpers.h b/drivers/parisc/iommu-helpers.h index a9c46cc2db37..8c33491b21fe 100644 --- a/drivers/parisc/iommu-helpers.h +++ b/drivers/parisc/iommu-helpers.h | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | #include <linux/prefetch.h> | ||
| 2 | |||
| 1 | /** | 3 | /** |
| 2 | * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir. | 4 | * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir. |
| 3 | * @ioc: The I/O Controller. | 5 | * @ioc: The I/O Controller. |