diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 09:47:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 09:47:43 +0100 |
| commit | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (patch) | |
| tree | 7f027e92e4578e293b20ac1f2c389600a795ea7f /drivers/media/video/cx88/cx88-video.c | |
| parent | drm/i915: Only save/restore cursor regs if !KMS (diff) | |
| parent | Linux 2.6.37-rc3 (diff) | |
| download | linux-4ab0fbd3a29067e1540f05093ae4ed07645d18c8.tar.xz linux-4ab0fbd3a29067e1540f05093ae4ed07645d18c8.zip | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index d2f159daa8b5..88b51194f917 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c @@ -31,7 +31,6 @@ #include <linux/kmod.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <linux/delay.h> |