diff options
author | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:30:22 +0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:30:22 +0400 |
commit | a36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch) | |
tree | c5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/media/video/saa7164/saa7164-fw.c | |
parent | bc078e4eab65f11bbaeed380593ab8151b30d703 (diff) | |
parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
download | linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.xz |
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-fw.c')
-rw-r--r-- | drivers/media/video/saa7164/saa7164-fw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c index ee0af3534ede..270245d275ab 100644 --- a/drivers/media/video/saa7164/saa7164-fw.c +++ b/drivers/media/video/saa7164/saa7164-fw.c @@ -20,6 +20,7 @@ */ #include <linux/firmware.h> +#include <linux/slab.h> #include "saa7164.h" |