diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 16:14:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 16:14:15 -0400 |
| commit | 47ea421af7479b90c481c94826f1c716fcf672cf (patch) | |
| tree | ba0b1b6a7019bf61ea2ca48ac6812af4a3d99647 /drivers/char | |
| parent | e349792a385ed47390d156155b1a1e19af1bf163 (diff) | |
| parent | c3bb4d24ab4b74e11992ccb9828569583166a87d (diff) | |
Merge branch 'for-linus' of git://linux-arm.org/linux-2.6
* 'for-linus' of git://linux-arm.org/linux-2.6:
kmemleak: Add more info to the MAINTAINERS entry
kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/vt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index de9ebee8657b..c796a86ab7f3 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -103,7 +103,6 @@ | |||
| 103 | #include <linux/io.h> | 103 | #include <linux/io.h> |
| 104 | #include <asm/system.h> | 104 | #include <asm/system.h> |
| 105 | #include <linux/uaccess.h> | 105 | #include <linux/uaccess.h> |
| 106 | #include <linux/kmemleak.h> | ||
| 107 | 106 | ||
| 108 | #define MAX_NR_CON_DRIVER 16 | 107 | #define MAX_NR_CON_DRIVER 16 |
| 109 | 108 | ||