diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
| commit | 0a6ce90779f4a12f8e75009d19209a4ee48707d8 (patch) | |
| tree | 9a8f2fdd6293a1cf8e281789ab3ba7b2f92384b8 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | abed55d1925015d07d0afd92eb50a0b2df2eca27 (diff) | |
| parent | e523ddb42e0588210df880e0e32f0de801803e94 (diff) | |
| download | mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.gz mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx-unbreak
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 96334a20b..181d96e83 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/smp_lock.h> #include <linux/delay.h> #include "saa7134-reg.h" |