diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /drivers/media/dvb/mantis/mantis_pci.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_pci.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c index 6c7534af6b44..59feeb84aec7 100644 --- a/drivers/media/dvb/mantis/mantis_pci.c +++ b/drivers/media/dvb/mantis/mantis_pci.c | |||
| @@ -41,11 +41,6 @@ | |||
| 41 | #include "dvb_frontend.h" | 41 | #include "dvb_frontend.h" |
| 42 | #include "dvb_net.h" | 42 | #include "dvb_net.h" |
| 43 | 43 | ||
| 44 | #include <asm/irq.h> | ||
| 45 | #include <linux/signal.h> | ||
| 46 | #include <linux/sched.h> | ||
| 47 | #include <linux/interrupt.h> | ||
| 48 | |||
| 49 | #include "mantis_common.h" | 44 | #include "mantis_common.h" |
| 50 | #include "mantis_reg.h" | 45 | #include "mantis_reg.h" |
| 51 | #include "mantis_pci.h" | 46 | #include "mantis_pci.h" |