diff options
| author |   Tony Lindgren <tony@atomide.com> | 2013-06-07 09:12:25 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 09:12:25 -0700 |
| commit | bea6412a994a8f49d81bc103907563ab9f94c371 (patch) | |
| tree | 93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /include/linux | |
| parent | ARM: OMAP2+: Remove omap4 ocp2scp pdata (diff) | |
| parent | ARM: AM33XX: hwmod data: irq, dma and addr info clean up (diff) | |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/aer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/aer.h b/include/linux/aer.h index ec10e1b24c1c..737f90ab4b62 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -49,10 +49,11 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) } #endif -extern void cper_print_aer(const char *prefix, struct pci_dev *dev, +extern void cper_print_aer(struct pci_dev *dev, int cper_severity, struct aer_capability_regs *aer); extern int cper_severity_to_aer(int cper_severity); extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, - int severity); + int severity, + struct aer_capability_regs *aer_regs); #endif //_AER_H_ |