git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
pci.h
diff --git
a/arch/powerpc/include/asm/pci.h
b/arch/powerpc/include/asm/pci.h
index 0c72f1897063662caf1d1416a881e079badd0a32..6a1861a6301e4361f64e6eaa2275afcfe5e596c4 100644
(file)
--- a/
arch/powerpc/include/asm/pci.h
+++ b/
arch/powerpc/include/asm/pci.h
@@
-52,10
+52,8
@@
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
#ifdef CONFIG_PCI
extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
-extern const struct dma_map_ops *get_pci_dma_ops(void);
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
-#define get_pci_dma_ops() NULL
#endif
#ifdef CONFIG_PPC64