git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
dvb-frontends
/
stv0299.c
diff --git
a/drivers/media/dvb-frontends/stv0299.c
b/drivers/media/dvb-frontends/stv0299.c
index b1f3d675d316d289c3269e30340a67380d4c390c..633b90e6fe8610e4e17227957dac2b085d211132 100644
(file)
--- a/
drivers/media/dvb-frontends/stv0299.c
+++ b/
drivers/media/dvb-frontends/stv0299.c
@@
-51,7
+51,7
@@
#include <linux/jiffies.h>
#include <asm/div64.h>
-#include
"dvb_frontend.h"
+#include
<media/dvb_frontend.h>
#include "stv0299.h"
struct stv0299_state {