diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 11:12:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 11:12:35 +1100 |
| commit | 6a959ded6a39cf4823dba68c41ee75e9fecd7cae (patch) | |
| tree | e9e5e0eac24ce7cfb2e256eca9b0fab18fd44187 /include/linux/aer.h | |
| parent | 22714173a64a1bf3ff3d9c7f557a9478d007c386 (diff) | |
| parent | f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (diff) | |
Merge remote-tracking branch 'pci/next'
Conflicts:
arch/arm64/boot/dts/apm-storm.dtsi
Diffstat (limited to 'include/linux/aer.h')
| -rw-r--r-- | include/linux/aer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/aer.h b/include/linux/aer.h index c826d1c28f9c..4fef65e57023 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -7,6 +7,8 @@ #ifndef _AER_H_ #define _AER_H_ +#include <linux/types.h> + #define AER_NONFATAL 0 #define AER_FATAL 1 #define AER_CORRECTABLE 2 |