Skip to content

Commit

Permalink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history
…t/bluetooth/bluetooth
  • Loading branch information
John W. Linville committed May 19, 2014
2 parents faf1dc6 + 40b9397 commit 20b4f9c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -7519,9 +7519,9 @@ int __init l2cap_init(void)
l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
NULL, &l2cap_debugfs_fops);

debugfs_create_u16("l2cap_le_max_credits", 0466, bt_debugfs,
debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,
&le_max_credits);
debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs,
debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,
&le_default_mps);

bt_6lowpan_init();
Expand Down

0 comments on commit 20b4f9c

Please sign in to comment.