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/firewire/firedtv-ci.c | |
| 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/firewire/firedtv-ci.c')
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-ci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c index d3c2cf60de76..8ffb565f0704 100644 --- a/drivers/media/dvb/firewire/firedtv-ci.c +++ b/drivers/media/dvb/firewire/firedtv-ci.c | |||
| @@ -220,6 +220,7 @@ static const struct file_operations fdtv_ca_fops = { | |||
| 220 | .open = dvb_generic_open, | 220 | .open = dvb_generic_open, |
| 221 | .release = dvb_generic_release, | 221 | .release = dvb_generic_release, |
| 222 | .poll = fdtv_ca_io_poll, | 222 | .poll = fdtv_ca_io_poll, |
| 223 | .llseek = noop_llseek, | ||
| 223 | }; | 224 | }; |
| 224 | 225 | ||
| 225 | static struct dvb_device fdtv_ca = { | 226 | static struct dvb_device fdtv_ca = { |