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 tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
mach
/
pci.h
diff --git
a/arch/arm/include/asm/mach/pci.h
b/arch/arm/include/asm/mach/pci.h
index 2d88af5be45fd6313126b1a6001643bcdac117c9..233b4b50eff3f1e52d1d45b75df9308f01398fd2 100644
(file)
--- a/
arch/arm/include/asm/mach/pci.h
+++ b/
arch/arm/include/asm/mach/pci.h
@@
-16,6
+16,7
@@
struct pci_sys_data;
struct pci_ops;
struct pci_bus;
struct pci_sys_data;
struct pci_ops;
struct pci_bus;
+struct pci_host_bridge;
struct device;
struct hw_pci {
struct device;
struct hw_pci {
@@
-25,7
+26,7
@@
struct hw_pci {
unsigned int io_optional:1;
void **private_data;
int (*setup)(int nr, struct pci_sys_data *);
unsigned int io_optional:1;
void **private_data;
int (*setup)(int nr, struct pci_sys_data *);
-
struct pci_bus *(*scan)(int nr, struct pci_sys_data
*);
+
int (*scan)(int nr, struct pci_host_bridge
*);
void (*preinit)(void);
void (*postinit)(void);
u8 (*swizzle)(struct pci_dev *dev, u8 *pin);
void (*preinit)(void);
void (*postinit)(void);
u8 (*swizzle)(struct pci_dev *dev, u8 *pin);