From 6356c5027f5590658988396fe5728284c29d4cc2 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Fri, 12 Dec 2008 09:52:35 +0100
Subject: [PATCH] --- yaml --- r: 123305 b: refs/heads/master c:
 10e5b64415ae9a0ba81dd1f1036d14dfdae9308c h: refs/heads/master i:   123303:
 a73e99dfe70c3522ec86f4abf4347b8494bf3430 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/alpha/include/asm/io.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b05749160c07..4f2711502a40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a6ffe16b5cc48abe7db8d04882dc45280eb693
+refs/heads/master: 10e5b64415ae9a0ba81dd1f1036d14dfdae9308c
diff --git a/trunk/arch/alpha/include/asm/io.h b/trunk/arch/alpha/include/asm/io.h
index e971ab000f95..eda9b909aa05 100644
--- a/trunk/arch/alpha/include/asm/io.h
+++ b/trunk/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