aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/machvec_init.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
commitd95c3578120e5bc4784069439f00ccb1b5f87717 (patch)
treec819de31de3983f3d69f223ede07667ff23bf7da /arch/ia64/include/asm/machvec_init.h
parentfix warning in arch/x86/kernel/cpu/intel_cacheinfo.c (diff)
parentMerge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/core (diff)
downloadlinux-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.gz
linux-d95c3578120e5bc4784069439f00ccb1b5f87717.zip
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'arch/ia64/include/asm/machvec_init.h')
-rw-r--r--arch/ia64/include/asm/machvec_init.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/machvec_init.h b/arch/ia64/include/asm/machvec_init.h
index ef964b286842..37a469849ab9 100644
--- a/arch/ia64/include/asm/machvec_init.h
+++ b/arch/ia64/include/asm/machvec_init.h
@@ -3,6 +3,7 @@
extern ia64_mv_send_ipi_t ia64_send_ipi;
extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge;
+extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;
extern ia64_mv_irq_to_vector __ia64_irq_to_vector;
extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;
extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;