From a41b0267cb7e5f1f786182db7c1ebfa38e4ef606 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 15 Oct 2009 20:28:53 +0000
Subject: [PATCH] --- yaml --- r: 172156 b: refs/heads/master c:
 5990108cfcd3eb2d365c9ea6f82318be80c4e9d3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/bluetooth/hci_vhci.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5a5e779301c9..b00a4ddb5b5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3cf652afb5404685e3d7ed6780a8d1fa10e21da
+refs/heads/master: 5990108cfcd3eb2d365c9ea6f82318be80c4e9d3
diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c
index d5cde6d86f89..ff02e901ab83 100644
--- a/trunk/drivers/bluetooth/hci_vhci.c
+++ b/trunk/drivers/bluetooth/hci_vhci.c
@@ -218,12 +218,6 @@ static unsigned int vhci_poll(struct file *file, poll_table *wait)
 	return POLLOUT | POLLWRNORM;
 }
 
-static int vhci_ioctl(struct inode *inode, struct file *file,
-					unsigned int cmd, unsigned long arg)
-{
-	return -EINVAL;
-}
-
 static int vhci_open(struct inode *inode, struct file *file)
 {
 	struct vhci_data *data;
@@ -287,7 +281,6 @@ static const struct file_operations vhci_fops = {
 	.read		= vhci_read,
 	.write		= vhci_write,
 	.poll		= vhci_poll,
-	.ioctl		= vhci_ioctl,
 	.open		= vhci_open,
 	.release	= vhci_release,
 };