diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-06 12:48:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-06 12:49:21 +0200 |
| commit | 9d014020234525ae100879d71078a4bcb4849195 (patch) | |
| tree | a0d6c0776670cb876e5a8118a4e6ed28d8f51cbc /drivers/media/video/omap3isp/ispccdc.c | |
| parent | 92e51938f5d005026ba4bb5b1fae5a86dc195b86 (diff) | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
Merge commit 'v3.1-rc9' into perf/core
Merge reason: pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
| -rw-r--r-- | drivers/media/video/omap3isp/ispccdc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c index 9d3459de04b2..80796eb0c53e 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/video/omap3isp/ispccdc.c @@ -31,6 +31,7 @@ #include <linux/dma-mapping.h> #include <linux/mm.h> #include <linux/sched.h> +#include <linux/slab.h> #include <media/v4l2-event.h> #include "isp.h" |