diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 18:07:00 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 18:07:00 +0100 |
| commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
| tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /arch/x86/kernel/cpu/cyrix.c | |
| parent | x86, boot: Use __attribute__((used)) to ensure videocard structs are emitted (diff) | |
| parent | Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.tar.xz linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.zip | |
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/kernel/cpu/cyrix.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cyrix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index d0969c75ab54..aaf152e79637 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c @@ -1,4 +1,3 @@ -#include <linux/init.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/pci.h> |