projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
intel_ips.c
diff --git
a/drivers/platform/x86/intel_ips.c
b/drivers/platform/x86/intel_ips.c
index e2065e06a3f308ab7050d714edea381572debc71..55663b3d72823b9a20eeca4c6fee94d227248aed 100644
(file)
--- a/
drivers/platform/x86/intel_ips.c
+++ b/
drivers/platform/x86/intel_ips.c
@@
-78,7
+78,7
@@
#include <asm/processor.h>
#include "intel_ips.h"
-#include <
asm-generic
/io-64-nonatomic-lo-hi.h>
+#include <
linux
/io-64-nonatomic-lo-hi.h>
#define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32