diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/char/misc.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 |