diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /arch/ia64/include/asm/iommu.h | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
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; | |||
| 11 | extern int iommu_detected; | 11 | extern int iommu_detected; |
| 12 | extern void iommu_dma_init(void); | 12 | extern void iommu_dma_init(void); |
| 13 | extern void machvec_init(const char *name); | 13 | extern void machvec_init(const char *name); |
| 14 | extern int forbid_dac; | ||
| 15 | 14 | ||
| 16 | #endif | 15 | #endif |