projects
/
platform
/
kernel
/
linux-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-fixes-2014-02-06' of ssh://git.freedesktop.org/git/drm-intel...
[platform/kernel/linux-stable.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_opregion.c
diff --git
a/drivers/gpu/drm/i915/intel_opregion.c
b/drivers/gpu/drm/i915/intel_opregion.c
index
6845960
..
acde294
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_opregion.c
+++ b/
drivers/gpu/drm/i915/intel_opregion.c
@@
-28,7
+28,6
@@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/acpi.h>
-#include <linux/acpi_io.h>
#include <acpi/video.h>
#include <drm/drmP.h>