git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-dvb.c
diff --git
a/drivers/media/video/saa7134/saa7134-dvb.c
b/drivers/media/video/saa7134/saa7134-dvb.c
index
fa29dd5
..
639ae51
100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-dvb.c
+++ b/
drivers/media/video/saa7134/saa7134-dvb.c
@@
-28,7
+28,6
@@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/suspend.h>
-#include <linux/config.h>
#include "saa7134-reg.h"