summaryrefslogtreecommitdiff
path: root/drivers/video/dnfb.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-05-22 02:31:36 +0400
committerNeilBrown <neilb@suse.de>2010-05-22 02:31:36 +0400
commit19fdb9eefb21b72edbc365b838502780c392bad6 (patch)
treedeae04c48532d6eab64ed4b0396737bb854b5506 /drivers/video/dnfb.c
parentbe6800a73aa2f3dc14744c3b80e676d189789f04 (diff)
parent3ff195b011d7decf501a4d55aeed312731094796 (diff)
downloadlinux-19fdb9eefb21b72edbc365b838502780c392bad6.tar.xz
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts: drivers/md/md.c - Resolved conflict in md_update_sb - Added extra 'NULL' arg to new instance of sysfs_get_dirent. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/video/dnfb.c')
-rw-r--r--drivers/video/dnfb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 606da043f4b4..ec56d2544c73 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -2,7 +2,6 @@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>