From fdd1950da746d78ad89d3c921f97f250ddfc4fba Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 12 Jul 2010 15:59:11 +0900
Subject: [PATCH] --- yaml --- r: 206103 b: refs/heads/master c:
 bfb51cd01661136bae1dd00c32d504cff6a9f924 h: refs/heads/master i:   206101:
 b519ab866aa5b7b3a950fbfb086805118f354993   206099:
 4631f110e042caf98138692f89b91364a78646d9   206095:
 3c5a72d70d5ae7e7bc2adb42af6531e8577ae102 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e3f6d492b08c..46f717120709 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253d2e549818f5a4a52e2db0aba3dacee21e5b38
+refs/heads/master: bfb51cd01661136bae1dd00c32d504cff6a9f924
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 740fb4ea9669..9afad0faa9b6 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2294,21 +2294,17 @@ void pci_msi_off(struct pci_dev *dev)
 }
 EXPORT_SYMBOL_GPL(pci_msi_off);
 
-#ifndef HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE
 int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size)
 {
 	return dma_set_max_seg_size(&dev->dev, size);
 }
 EXPORT_SYMBOL(pci_set_dma_max_seg_size);
-#endif
 
-#ifndef HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY
 int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask)
 {
 	return dma_set_seg_boundary(&dev->dev, mask);
 }
 EXPORT_SYMBOL(pci_set_dma_seg_boundary);
-#endif
 
 static int pcie_flr(struct pci_dev *dev, int probe)
 {