diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/media/video/saa7164 | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/media/video/saa7164')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h index 1d9c5cbbbc52..041ae8e20f68 100644 --- a/drivers/media/video/saa7164/saa7164.h +++ b/drivers/media/video/saa7164/saa7164.h | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | #include <media/tveeprom.h> | 58 | #include <media/tveeprom.h> |
| 59 | #include <media/videobuf-dma-sg.h> | 59 | #include <media/videobuf-dma-sg.h> |
| 60 | #include <media/videobuf-dvb.h> | 60 | #include <media/videobuf-dvb.h> |
| 61 | #include <linux/smp_lock.h> | ||
| 62 | #include <dvb_demux.h> | 61 | #include <dvb_demux.h> |
| 63 | #include <dvb_frontend.h> | 62 | #include <dvb_frontend.h> |
| 64 | #include <dvb_net.h> | 63 | #include <dvb_net.h> |