---

yaml --- r: 146680 b: refs/heads/master c: 3e98f9f h: refs/heads/master v: v3
git-mirror · Apr 24, 2009 · cb7a3d2 · cb7a3d2
1 parent b74d01b
commit cb7a3d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b
+refs/heads/master: 3e98f9f15e916c48dfc5231d7e6a59be7f122764
diff --git a/trunk/arch/sh/include/asm/pci.h b/trunk/arch/sh/include/asm/pci.h
@@ -88,13 +88,15 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 #endif
 
+#ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 					enum pci_dma_burst_strategy *strat,
 					unsigned long *strategy_parameter)
 {
 	*strat = PCI_DMA_BURST_INFINITY;
 	*strategy_parameter = ~0UL;
 }
+#endif
 
 #ifdef CONFIG_SUPERH32
 /*