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_common.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_common.h')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h index d0b645a483c9..bd400d21b81f 100644 --- a/drivers/media/dvb/mantis/mantis_common.h +++ b/drivers/media/dvb/mantis/mantis_common.h | |||
| @@ -171,7 +171,9 @@ struct mantis_pci { | |||
| 171 | struct work_struct uart_work; | 171 | struct work_struct uart_work; |
| 172 | spinlock_t uart_lock; | 172 | spinlock_t uart_lock; |
| 173 | 173 | ||
| 174 | struct input_dev *rc; | 174 | struct rc_dev *rc; |
| 175 | char input_name[80]; | ||
| 176 | char input_phys[80]; | ||
| 175 | }; | 177 | }; |
| 176 | 178 | ||
| 177 | #define MANTIS_HIF_STATUS (mantis->gpio_status) | 179 | #define MANTIS_HIF_STATUS (mantis->gpio_status) |