diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
| commit | 9134d02bc0af4a8747d448d1f811ec5f8eb96df6 (patch) | |
| tree | 704c3e5dcc10f360815c4868a74711f82fb62e27 /drivers/media/video/se401.c | |
| parent | bbb20089a3275a19e475dbc21320c3742e3ca423 (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
Merge commit 'md/for-linus' into async-tx-next
Conflicts:
drivers/md/raid5.c
Diffstat (limited to 'drivers/media/video/se401.c')
| -rw-r--r-- | drivers/media/video/se401.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index c8f05297d0f0..85ffc2cba039 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
| @@ -31,6 +31,7 @@ static const char version[] = "0.24"; | |||
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
| 33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
| 34 | #include <linux/smp_lock.h> | ||
| 34 | #include <linux/pagemap.h> | 35 | #include <linux/pagemap.h> |
| 35 | #include <linux/usb.h> | 36 | #include <linux/usb.h> |
| 36 | #include "se401.h" | 37 | #include "se401.h" |