diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 20:09:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 20:09:44 +0100 |
| commit | d6c3112abe44d7f718bd5aec8ab9469fecff6041 (patch) | |
| tree | 362e826e1e39e6108301893ba35100c8719028b6 /arch/ia64/include/asm/iommu.h | |
| parent | tty: Fix USB kref leak (diff) | |
| parent | x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI (diff) | |
| download | linux-d6c3112abe44d7f718bd5aec8ab9469fecff6041.tar.xz linux-d6c3112abe44d7f718bd5aec8ab9469fecff6041.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI
Diffstat (limited to 'arch/ia64/include/asm/iommu.h')
| -rw-r--r-- | arch/ia64/include/asm/iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index 5fb2bb93de3b..0490794fe4aa 100644 --- a/arch/ia64/include/asm/iommu.h +++ b/arch/ia64/include/asm/iommu.h @@ -11,6 +11,5 @@ extern int force_iommu, no_iommu; extern int iommu_detected; extern void iommu_dma_init(void); extern void machvec_init(const char *name); -extern int forbid_dac; #endif |