diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-08 22:30:28 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-08 22:30:47 -0700 |
| commit | 4d8f509e7a5d2eb636d57ddb677e504a90a4f99d (patch) | |
| tree | 2f359163b1e8a08bd0d3a478096d80623582bfbf /include/linux | |
| parent | b9747b3aafa7687414491e789c1a1b05c8781018 (diff) | |
| parent | 3cc3b617dc39dad1e566ccfc4500154cb7c51aa3 (diff) | |
| download | lwn-4d8f509e7a5d2eb636d57ddb677e504a90a4f99d.tar.gz lwn-4d8f509e7a5d2eb636d57ddb677e504a90a4f99d.zip | |
Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical
From Barry Song, SiRF fixes for v3.10 (that we're punting to 3.11):
- Replace include linux/module.h with linux/export.h
- fix a checkpatch issue
- use of_platform_populate instead of of_platform_bus_probe
* tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
arm: prima2: use of_platform_populate instead of of_platform_bus_probe
ARM: prima2: fix a checkpatch issue
ARM: prima2: Replace include linux/module.h with linux/export.h
+ Linux 3.10-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
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_ |