summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/drm
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-03-07 12:42:16 -0800
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-03-07 12:42:16 -0800
commit90a5c5ee241c60f233fdb410d5be602c83bee338 (patch)
tree59270ecb2b7a19a53e0f517cbad3a57df810cda0 /patches/collateral-evolutions/drm
parentdb0e9cad45c9199cf14ae5b9d78d8dd6697d7860 (diff)
compat-drivers: refresh patches for next-20130307
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
-rw-r--r--patches/collateral-evolutions/drm/04-revert-prime-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
index b2ab4dc5..11cd8c95 100644
--- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch
+++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
@@ -282,7 +282,7 @@ not < 3.3.0.
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1023,7 +1023,11 @@ static struct drm_driver driver = {
+@@ -1025,7 +1025,11 @@ static struct drm_driver driver = {
*/
.driver_features =
DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -294,7 +294,7 @@ not < 3.3.0.
.load = i915_driver_load,
.unload = i915_driver_unload,
.open = i915_driver_open,
-@@ -1046,10 +1050,12 @@ static struct drm_driver driver = {
+@@ -1048,10 +1052,12 @@ static struct drm_driver driver = {
.gem_free_object = i915_gem_free_object,
.gem_vm_ops = &i915_gem_vm_ops,