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 branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvbdev.h
diff --git
a/drivers/media/dvb/dvb-core/dvbdev.h
b/drivers/media/dvb/dvb-core/dvbdev.h
index
7992730
..
487919b
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvbdev.h
+++ b/
drivers/media/dvb/dvb-core/dvbdev.h
@@
-27,7
+27,6
@@
#include <linux/poll.h>
#include <linux/fs.h>
#include <linux/list.h>
-#include <linux/smp_lock.h>
#define DVB_MAJOR 212