diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 03:49:45 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 03:49:45 +0300 |
commit | 8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58 (patch) | |
tree | 5d6c28a0f5654b5bae84e65dbb5563049b7b497e /arch/x86/platform/geode/net5501.c | |
parent | da1770238597a4619b7845583881543ca81270cd (diff) | |
parent | d97ee99bf225d35a50ed8812c3d037b2ba7ad2ea (diff) | |
download | linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.tar.xz |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updayes from Ingo Molnar:
"Most of the commits add ACRN hypervisor guest support, plus two
cleanups"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/jailhouse: Mark jailhouse_x2apic_available() as __init
x86/platform/geode: Drop <linux/gpio.h> includes
x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector
x86: Add support for Linux guests on an ACRN hypervisor
x86/Kconfig: Add new X86_HV_CALLBACK_VECTOR config symbol
Diffstat (limited to 'arch/x86/platform/geode/net5501.c')
-rw-r--r-- | arch/x86/platform/geode/net5501.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/platform/geode/net5501.c b/arch/x86/platform/geode/net5501.c index 2c24d8d30436..163e1b545517 100644 --- a/arch/x86/platform/geode/net5501.c +++ b/arch/x86/platform/geode/net5501.c @@ -18,7 +18,6 @@ #include <linux/string.h> #include <linux/leds.h> #include <linux/platform_device.h> -#include <linux/gpio.h> #include <linux/input.h> #include <linux/gpio_keys.h> |