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
/
char
/
misc.c
diff --git
a/drivers/char/misc.c
b/drivers/char/misc.c
index
94a136e
..
92ab03d
100644
(file)
--- a/
drivers/char/misc.c
+++ b/
drivers/char/misc.c
@@
-40,7
+40,6
@@
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/mutex.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@
-49,6
+48,7
@@
#include <linux/device.h>
#include <linux/tty.h>
#include <linux/kmod.h>
#include <linux/device.h>
#include <linux/tty.h>
#include <linux/kmod.h>
+#include <linux/gfp.h>
/*
* Head entry for the doubly linked miscdevice list
/*
* Head entry for the doubly linked miscdevice list