git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
asm-x86_64
/
pci.h
diff --git
a/include/asm-x86_64/pci.h
b/include/asm-x86_64/pci.h
index
49c5e92
..
8a05af2
100644
(file)
--- a/
include/asm-x86_64/pci.h
+++ b/
include/asm-x86_64/pci.h
@@
-1,6
+1,7
@@
#ifndef __x8664_PCI_H
#define __x8664_PCI_H
#ifndef __x8664_PCI_H
#define __x8664_PCI_H
+#include <linux/config.h>
#include <asm/io.h>
#ifdef __KERNEL__
#include <asm/io.h>
#ifdef __KERNEL__
@@
-39,8
+40,8
@@
int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
#include <asm/scatterlist.h>
#include <linux/string.h>
#include <asm/page.h>
#include <asm/scatterlist.h>
#include <linux/string.h>
#include <asm/page.h>
+#include <linux/dma-mapping.h> /* for have_iommu */
-extern void pci_iommu_alloc(void);
extern int iommu_setup(char *opt);
/* The PCI address space does equal the physical memory
extern int iommu_setup(char *opt);
/* The PCI address space does equal the physical memory
@@
-52,7
+53,7
@@
extern int iommu_setup(char *opt);
*/
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
*/
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-#if
defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU)
+#if
def CONFIG_GART_IOMMU
/*
* x86-64 always supports DAC, but sometimes it is useful to force
/*
* x86-64 always supports DAC, but sometimes it is useful to force