diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:03:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:03:57 -0500 |
| commit | 2a0fede97fd52a5c9789d1d54ebd3b46878151c3 (patch) | |
| tree | a0a1f5bdc25491414df20ff90785ca14e3929cc3 /arch/x86/lib | |
| parent | 06bc0f4a2e7fe54d98539686f070ceccfd73953d (diff) | |
| parent | d139336700a5f3a560da235e4dfcd286773025d4 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpu, amd: Fix a shadowed variable situation
um, x86: Fix vDSO build
x86: Delete non-required instances of include <linux/init.h>
x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
x86/traps: Clean up error exception handler definitions
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/delay.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c index 7c3bee636e2f..39d6a3db0b96 100644 --- a/arch/x86/lib/delay.c +++ b/arch/x86/lib/delay.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/timex.h> | 16 | #include <linux/timex.h> |
| 17 | #include <linux/preempt.h> | 17 | #include <linux/preempt.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/init.h> | ||
| 20 | 19 | ||
| 21 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
| 22 | #include <asm/delay.h> | 21 | #include <asm/delay.h> |