aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 08:42:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 08:42:11 -0700
commit74c7d2f5200a340ae6655e9adcf990381e387937 (patch)
tree13e5290fff662995e769e64dbd5b64450296dcc6 /arch/x86/kernel
parent1e2f5b598aa56c3978c2e623f72e9656a565c6c9 (diff)
parent06d219dc22daa26b79ec8e611caa68801607f15d (diff)
downloadkernel_goldelico_gta04-74c7d2f5200a340ae6655e9adcf990381e387937.zip
kernel_goldelico_gta04-74c7d2f5200a340ae6655e9adcf990381e387937.tar.gz
kernel_goldelico_gta04-74c7d2f5200a340ae6655e9adcf990381e387937.tar.bz2
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar: "Small fixes and cleanups all over the map" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/setup: Drop unneeded include <asm/dmi.h> x86/olpc/xo1/sci: Don't call input_free_device() after input_unregister_device() x86/platform/intel/mrst: Remove cast for kmalloc() return value x86/platform/uv: Replace kmalloc() & memset with kzalloc()
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/setup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a5d550f..4689855 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -82,7 +82,6 @@
#include <asm/timer.h>
#include <asm/i8259.h>
#include <asm/sections.h>
-#include <asm/dmi.h>
#include <asm/io_apic.h>
#include <asm/ist.h>
#include <asm/setup_arch.h>