summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-31 08:19:48 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-31 08:19:48 +0100
commit818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch)
treead3435c3f57c8222ad61709b716168932f13be6c /arch/alpha
parenttracing/kmemtrace: export kmemtrace_mark_alloc_node() / kmemtrace_mark_free() (diff)
parentMerge branch 'linus' into tracing/kmemtrace (diff)
downloadlinux-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.xz
linux-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/include/asm/io.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
index e971ab000f95..eda9b909aa05 100644
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
@@ -96,9 +96,6 @@ static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page)
return page_to_phys(page);
}
-/* This depends on working iommu. */
-#define BIO_VMERGE_BOUNDARY (alpha_mv.mv_pci_tbi ? PAGE_SIZE : 0)
-
/* Maximum PIO space address supported? */
#define IO_SPACE_LIMIT 0xffff