projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-block.git]
/
drivers
/
media
/
video
/
video-buf-dvb.c
diff --git
a/drivers/media/video/video-buf-dvb.c
b/drivers/media/video/video-buf-dvb.c
index f53edf1923b7de3fa558c2adf4c42980f97ad608..fcc5467e76364f982168b6d3d49077707a8edbde 100644
(file)
--- a/
drivers/media/video/video-buf-dvb.c
+++ b/
drivers/media/video/video-buf-dvb.c
@@
-20,7
+20,7
@@
#include <linux/fs.h>
#include <linux/kthread.h>
#include <linux/file.h>
-#include <linux/
suspend
.h>
+#include <linux/
freezer
.h>
#include <media/video-buf.h>
#include <media/video-buf-dvb.h>