projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
include
/
asm-ppc
/
pci.h
diff --git
a/include/asm-ppc/pci.h
b/include/asm-ppc/pci.h
index
9dd06cd
..
61434ed
100644
(file)
--- a/
include/asm-ppc/pci.h
+++ b/
include/asm-ppc/pci.h
@@
-24,9
+24,9
@@
struct pci_dev;
* Set this to 1 if you want the kernel to re-assign all PCI
* bus numbers
*/
* Set this to 1 if you want the kernel to re-assign all PCI
* bus numbers
*/
-extern int pci_assign_all_bus
s
es;
+extern int pci_assign_all_buses;
-#define pcibios_assign_all_busses() (pci_assign_all_bus
s
es)
+#define pcibios_assign_all_busses() (pci_assign_all_buses)
#define pcibios_scan_all_fns(a, b) 0
#define PCIBIOS_MIN_IO 0x1000
#define pcibios_scan_all_fns(a, b) 0
#define PCIBIOS_MIN_IO 0x1000
@@
-126,7
+126,7
@@
extern void pcibios_add_platform_entries(struct pci_dev *dev);
struct file;
extern pgprot_t pci_phys_mem_access_prot(struct file *file,
struct file;
extern pgprot_t pci_phys_mem_access_prot(struct file *file,
- unsigned long
offset
,
+ unsigned long
pfn
,
unsigned long size,
pgprot_t prot);
unsigned long size,
pgprot_t prot);