diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
commit | 4f797f56c3786e2c6bc542b3f80e9a599b073976 (patch) | |
tree | 12f311ac2a06329d58d43437243a9b777c7822f4 /arch/arm/include/asm/pci.h | |
parent | c5105d764e0214bcc4c6d40d7ba231d01b2e9dda (diff) | |
parent | 63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 (diff) |
Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/pci.h')
-rw-r--r-- | arch/arm/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 0abd389cf0ec..68e6f25784a4 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h @@ -27,5 +27,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? 15 : 14; } +extern void pcibios_report_status(unsigned int status_mask, int warn); + #endif /* __KERNEL__ */ #endif |