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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_fb.c
diff --git
a/drivers/gpu/drm/i915/intel_fb.c
b/drivers/gpu/drm/i915/intel_fb.c
index
8cd791d
..
8a0b3bc
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_fb.c
+++ b/
drivers/gpu/drm/i915/intel_fb.c
@@
-30,7
+30,6
@@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/tty.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/tty.h>
-#include <linux/slab.h>
#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
@@
-145,7
+144,7
@@
static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
ret = -ENOMEM;
goto out;
}
ret = -ENOMEM;
goto out;
}
- obj_priv =
fbo->driver_private
;
+ obj_priv =
to_intel_bo(fbo)
;
mutex_lock(&dev->struct_mutex);
mutex_lock(&dev->struct_mutex);