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 'drm-fbdev-cleanup' into drm-core-next
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_fbcon.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index
bea9f78
..
f29fa8c
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@
-30,7
+30,6
@@
#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>