From b4cb4e61eb26652be792038a17eabed937db535f Mon Sep 17 00:00:00 2001
From: "Luck, Tony" <tony.luck@intel.com>
Date: Tue, 6 Jan 2009 10:25:25 -0800
Subject: [PATCH] --- yaml --- r: 138897 b: refs/heads/master c:
 07716e4df25523bf85b4e304d2cf63dbf3cbabf9 h: refs/heads/master i:   138895:
 91c00e49835941013b6cb466c60438f82c378f38 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/kernel/pci-swiotlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea758cbbec95..89d365d6ab2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f98eee8ea99fe74ee9c4e867ba178ec3072793be
+refs/heads/master: 07716e4df25523bf85b4e304d2cf63dbf3cbabf9
diff --git a/trunk/arch/ia64/kernel/pci-swiotlb.c b/trunk/arch/ia64/kernel/pci-swiotlb.c
index e6b2ec9b27da..d21dea44e76f 100644
--- a/trunk/arch/ia64/kernel/pci-swiotlb.c
+++ b/trunk/arch/ia64/kernel/pci-swiotlb.c
@@ -33,7 +33,7 @@ struct dma_map_ops swiotlb_dma_ops = {
 	.mapping_error = swiotlb_dma_mapping_error,
 };
 
-void swiotlb_dma_init(void)
+void __init swiotlb_dma_init(void)
 {
 	dma_ops = &swiotlb_dma_ops;
 	swiotlb_init();