aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 22:15:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 22:15:13 -0700
commitc101f3136cc98a003d0d16be6fab7d0d950581a6 (patch)
tree738f3ea3ff68245fb0900aeeeb73f1accb2bf956 /drivers
parent359ea2f1352a77177540a213283bc7489f546ced (diff)
parente3e01d6005ab4b0877f1fb3efef7f5b745e743be (diff)
downloadmrst-s0i3-test-c101f3136cc98a003d0d16be6fab7d0d950581a6.tar.gz
mrst-s0i3-test-c101f3136cc98a003d0d16be6fab7d0d950581a6.tar.xz
mrst-s0i3-test-c101f3136cc98a003d0d16be6fab7d0d950581a6.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/frontends/tda80xx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c
index 032d348dafb..88e125079ca 100644
--- a/drivers/media/dvb/frontends/tda80xx.c
+++ b/drivers/media/dvb/frontends/tda80xx.c
@@ -27,7 +27,6 @@
#include <linux/spinlock.h>
#include <linux/threads.h>
#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>