Pull sony into release branch

[linux-2.6] / drivers / bluetooth / hci_vhci.c

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index fc2130f1776a8e1b720fad46cb3e8b5e848fe75e..b71a5ccc587f984d11707d6e557d0e77fccb1d92 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -276,7 +276,7 @@ static int vhci_open(struct inode *inode, struct file *file)
 
        data->hdev = hdev;
 
-       hdev->type = HCI_VHCI;
+       hdev->type = HCI_VIRTUAL;
        hdev->driver_data = data;
 
        hdev->open     = vhci_open_dev;
@@ -332,7 +332,7 @@ static int vhci_fasync(int fd, struct file *file, int on)
        return 0;
 }
 
-static struct file_operations vhci_fops = {
+static const struct file_operations vhci_fops = {
        .owner          = THIS_MODULE,
        .llseek         = vhci_llseek,
        .read           = vhci_read,