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/media/video/pvrusb2/pvrusb2-debugifc.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/media/video/pvrusb2/pvrusb2-debugifc.c')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c index ae977668c496..e9b11e119f62 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include "pvrusb2-debugifc.h" | 22 | #include "pvrusb2-debugifc.h" |
| 24 | #include "pvrusb2-hdw.h" | 23 | #include "pvrusb2-hdw.h" |
| 25 | #include "pvrusb2-debug.h" | 24 | #include "pvrusb2-debug.h" |