projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
mfd
/
intel-lpss.c
diff --git
a/drivers/mfd/intel-lpss.c
b/drivers/mfd/intel-lpss.c
index
001a7d7
..
6255513
100644
(file)
--- a/
drivers/mfd/intel-lpss.c
+++ b/
drivers/mfd/intel-lpss.c
@@
-25,8
+25,7
@@
#include <linux/pm_qos.h>
#include <linux/pm_runtime.h>
#include <linux/seq_file.h>
-
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
#include "intel-lpss.h"