diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/mantis/mantis_ioc.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_ioc.h')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_ioc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_ioc.h b/drivers/media/dvb/mantis/mantis_ioc.h index 188fe5a81614..d56e002b2955 100644 --- a/drivers/media/dvb/mantis/mantis_ioc.h +++ b/drivers/media/dvb/mantis/mantis_ioc.h | |||
| @@ -44,7 +44,7 @@ enum mantis_stream_control { | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | extern int mantis_get_mac(struct mantis_pci *mantis); | 46 | extern int mantis_get_mac(struct mantis_pci *mantis); |
| 47 | extern void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value); | 47 | extern void mantis_gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value); |
| 48 | 48 | ||
| 49 | extern int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl); | 49 | extern int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl); |
| 50 | 50 | ||