git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
pci.h
diff --git
a/arch/powerpc/include/asm/pci.h
b/arch/powerpc/include/asm/pci.h
index
1f52268
..
49c3de5
100644
(file)
--- a/
arch/powerpc/include/asm/pci.h
+++ b/
arch/powerpc/include/asm/pci.h
@@
-44,7
+44,7
@@
struct pci_dev;
* bus numbers (don't do that on ppc64 yet !)
*/
#define pcibios_assign_all_busses() \
- (p
pc_pci_has_flag(PPC_
PCI_REASSIGN_ALL_BUS))
+ (p
ci_has_flag(
PCI_REASSIGN_ALL_BUS))
static inline void pcibios_set_master(struct pci_dev *dev)
{