projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
acpi
/
apei
/
ghes.c
diff --git
a/drivers/acpi/apei/ghes.c
b/drivers/acpi/apei/ghes.c
index
46766ef
..
dab7cb7
100644
(file)
--- a/
drivers/acpi/apei/ghes.c
+++ b/
drivers/acpi/apei/ghes.c
@@
-33,7
+33,6
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <linux/acpi_io.h>
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/timer.h>