projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
include
/
asm-sparc
/
pci.h
diff --git
a/include/asm-sparc/pci.h
b/include/asm-sparc/pci.h
index
97052ba
..
3864474
100644
(file)
--- a/
include/asm-sparc/pci.h
+++ b/
include/asm-sparc/pci.h
@@
-15,12
+15,12
@@
#define PCI_IRQ_NONE 0xffffffff
#define PCI_IRQ_NONE 0xffffffff
-
extern
inline void pcibios_set_master(struct pci_dev *dev)
+
static
inline void pcibios_set_master(struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}
{
/* No special bus mastering setup handling */
}
-
extern
inline void pcibios_penalize_isa_irq(int irq, int active)
+
static
inline void pcibios_penalize_isa_irq(int irq, int active)
{
/* We don't do dynamic PCI IRQ allocation */
}
{
/* We don't do dynamic PCI IRQ allocation */
}
@@
-137,7
+137,7
@@
extern void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist
* only drive the low 24-bits during PCI bus mastering, then
* you would pass 0x00ffffff as the mask to this function.
*/
* only drive the low 24-bits during PCI bus mastering, then
* you would pass 0x00ffffff as the mask to this function.
*/
-
extern
inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
+
static
inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
{
return 1;
}
{
return 1;
}