diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 12:07:00 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 12:07:00 -0500 |
| commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
| tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /arch/x86/pci/fixup.c | |
| parent | 9b3965f7401b0cc3ed2c228085a4c13b1c9243b1 (diff) | |
| parent | f4bcd8ccddb02833340652e9f46f5127828eb79d (diff) | |
Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
Bring in upstream merge of x86/kaslr for future patches.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/pci/fixup.c')
| -rw-r--r-- | arch/x86/pci/fixup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index b046e070e088..bca9e85daaa5 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/dmi.h> | 6 | #include <linux/dmi.h> |
| 7 | #include <linux/pci.h> | 7 | #include <linux/pci.h> |
| 8 | #include <linux/init.h> | ||
| 9 | #include <linux/vgaarb.h> | 8 | #include <linux/vgaarb.h> |
| 10 | #include <asm/pci_x86.h> | 9 | #include <asm/pci_x86.h> |
| 11 | 10 | ||