Merge remote-tracking branch 'kwolf/for-anthony' into staging

[qemu.git] / bt-vhci.c

diff --git a/bt-vhci.c b/bt-vhci.c
index 5ab2ab8dbd25b8a3d20806e90ca111a93c73ec35..3c5772093efc340e4d60f86e093fb8318c2ed141 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -14,13 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu-common.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "net.h"
 #include "hw/bt.h"
 
@@ -165,5 +163,5 @@ void bt_vhci_init(struct HCIInfo *info)
     s->info->evt_recv = vhci_out_hci_packet_event;
     s->info->acl_recv = vhci_out_hci_packet_acl;
 
-    qemu_set_fd_handler(s->fd, vhci_read, 0, s);
+    qemu_set_fd_handler(s->fd, vhci_read, NULL, s);
 }