diff options
author | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
commit | f02fac63308349b1dbde468adfd084fdb560eeae (patch) | |
tree | 35c39e5c3c70e40c52bc18c07a88dd7a1becb649 /net/bluetooth/mgmt.c | |
parent | 6ff6845be02be8d53da28d2333a015d54b1234db (diff) | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) |
Merge commit 'v3.4-rc6' into android-3.4
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 99ecc8b16ed..c05c3a69c37 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2884,7 +2884,7 @@ int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status) return 0; } -int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, u8 persistent) +int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, bool persistent) { struct mgmt_ev_new_link_key ev; |