diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
| commit | c101f3136cc98a003d0d16be6fab7d0d950581a6 (patch) | |
| tree | 738f3ea3ff68245fb0900aeeeb73f1accb2bf956 /drivers | |
| parent | 359ea2f1352a77177540a213283bc7489f546ced (diff) | |
| parent | e3e01d6005ab4b0877f1fb3efef7f5b745e743be (diff) | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c index 032d348dafb7..88e125079ca1 100644 --- a/drivers/media/dvb/frontends/tda80xx.c +++ b/drivers/media/dvb/frontends/tda80xx.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | #include <linux/threads.h> | 28 | #include <linux/threads.h> |
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/irq.h> | ||
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |