git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_drv.c
diff --git
a/drivers/gpu/drm/i915/i915_drv.c
b/drivers/gpu/drm/i915/i915_drv.c
index
4c8d681
..
e9c2cfe
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_drv.c
+++ b/
drivers/gpu/drm/i915/i915_drv.c
@@
-35,6
+35,7
@@
#include "intel_drv.h"
#include <linux/console.h>
#include "intel_drv.h"
#include <linux/console.h>
+#include <linux/module.h>
#include "drm_crtc_helper.h"
static int i915_modeset __read_mostly = -1;
#include "drm_crtc_helper.h"
static int i915_modeset __read_mostly = -1;
@@
-788,8
+789,8
@@
static struct vm_operations_struct i915_gem_vm_ops = {
};
static struct drm_driver driver = {
};
static struct drm_driver driver = {
- /*
don't use mtrr's here, the Xserver or user
space app should
- * deal with them for
i
ntel hardware.
+ /*
Don't use MTRRs here; the Xserver or user
space app should
+ * deal with them for
I
ntel hardware.
*/
.driver_features =
DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
*/
.driver_features =
DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/