From 92913357bb2b8c664fe7a90daf71546dbaa4b5be Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 5 Oct 2011 14:56:46 +0200 Subject: [PATCH] --- yaml --- r: 264831 b: refs/heads/master c: c675786a162ce06ffd3f63beca933d83431eae38 h: refs/heads/master i: 264829: 587bba77fdf9b730982e1c737615588472a6e056 264827: 28a4029c6c0033e29804ad70c2ffee04fe1dd0e1 264823: 3315119e386b037a161bcc78ecc8920cf1f1b8eb 264815: 3e5230e2a6da35dd6fa273255298ea122a9fa0e0 264799: 7db8b7131b53951da1a66353a2cbe45761e2f74f 264767: 3fb005a545a81f5f783e0cdae5b5f3e859fa7ef5 264703: f49a3a6f7dd4af1215c0a495fd0792a19f1c1571 v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/btmrvl_sdio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18486dcfef68..317d736e46c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ffe1ffb074d2152db5fbecab815915f657306bb +refs/heads/master: c675786a162ce06ffd3f63beca933d83431eae38 diff --git a/trunk/drivers/bluetooth/btmrvl_sdio.c b/trunk/drivers/bluetooth/btmrvl_sdio.c index 7f521d4ac657..c827d737ccee 100644 --- a/trunk/drivers/bluetooth/btmrvl_sdio.c +++ b/trunk/drivers/bluetooth/btmrvl_sdio.c @@ -81,7 +81,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8787 = { .io_port_2 = 0x7a, }; -static const struct btmrvl_sdio_device btmrvl_sdio_sd6888 = { +static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = { .helper = "sd8688_helper.bin", .firmware = "sd8688.bin", .reg = &btmrvl_reg_8688, @@ -98,7 +98,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = { static const struct sdio_device_id btmrvl_sdio_ids[] = { /* Marvell SD8688 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105), - .driver_data = (unsigned long) &btmrvl_sdio_sd6888 }, + .driver_data = (unsigned long) &btmrvl_sdio_sd8688 }, /* Marvell SD8787 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A), .driver_data = (unsigned long) &btmrvl_sdio_sd8787 },