diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /drivers/char/misc.c | |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 94a136e96c06..92ab03d28294 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/miscdevice.h> | 40 | #include <linux/miscdevice.h> |
| 41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 42 | #include <linux/major.h> | 42 | #include <linux/major.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
| 45 | #include <linux/proc_fs.h> | 44 | #include <linux/proc_fs.h> |
| 46 | #include <linux/seq_file.h> | 45 | #include <linux/seq_file.h> |
| @@ -49,6 +48,7 @@ | |||
| 49 | #include <linux/device.h> | 48 | #include <linux/device.h> |
| 50 | #include <linux/tty.h> | 49 | #include <linux/tty.h> |
| 51 | #include <linux/kmod.h> | 50 | #include <linux/kmod.h> |
| 51 | #include <linux/gfp.h> | ||
| 52 | 52 | ||
| 53 | /* | 53 | /* |
| 54 | * Head entry for the doubly linked miscdevice list | 54 | * Head entry for the doubly linked miscdevice list |