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/bluetooth/hci_vhci.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/bluetooth/hci_vhci.c')
| -rw-r--r-- | drivers/bluetooth/hci_vhci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 3aa7b2a54b6f..67c180c2c1e0 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
| @@ -282,6 +282,7 @@ static const struct file_operations vhci_fops = { | |||
| 282 | .poll = vhci_poll, | 282 | .poll = vhci_poll, |
| 283 | .open = vhci_open, | 283 | .open = vhci_open, |
| 284 | .release = vhci_release, | 284 | .release = vhci_release, |
| 285 | .llseek = no_llseek, | ||
| 285 | }; | 286 | }; |
| 286 | 287 | ||
| 287 | static struct miscdevice vhci_miscdev= { | 288 | static struct miscdevice vhci_miscdev= { |