projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/smpboot: Init apic mapping before usage
[cascardo/linux.git]
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/net/bluetooth/af_bluetooth.c
b/net/bluetooth/af_bluetooth.c
index
0b5f729
..
1aff2da
100644
(file)
--- a/
net/bluetooth/af_bluetooth.c
+++ b/
net/bluetooth/af_bluetooth.c
@@
-26,11
+26,13
@@
#include <linux/module.h>
#include <linux/debugfs.h>
#include <linux/module.h>
#include <linux/debugfs.h>
+#include <linux/stringify.h>
#include <asm/ioctls.h>
#include <net/bluetooth/bluetooth.h>
#include <linux/proc_fs.h>
#include <asm/ioctls.h>
#include <net/bluetooth/bluetooth.h>
#include <linux/proc_fs.h>
+#include "leds.h"
#include "selftest.h"
/* Bluetooth sockets */
#include "selftest.h"
/* Bluetooth sockets */
@@
-712,13
+714,16
@@
static struct net_proto_family bt_sock_family_ops = {
struct dentry *bt_debugfs;
EXPORT_SYMBOL_GPL(bt_debugfs);
struct dentry *bt_debugfs;
EXPORT_SYMBOL_GPL(bt_debugfs);
+#define VERSION __stringify(BT_SUBSYS_VERSION) "." \
+ __stringify(BT_SUBSYS_REVISION)
+
static int __init bt_init(void)
{
int err;
sock_skb_cb_check_size(sizeof(struct bt_skb_cb));
static int __init bt_init(void)
{
int err;
sock_skb_cb_check_size(sizeof(struct bt_skb_cb));
- BT_INFO("Core ver %s",
BT_SUBSYS_
VERSION);
+ BT_INFO("Core ver %s", VERSION);
err = bt_selftest();
if (err < 0)
err = bt_selftest();
if (err < 0)
@@
-726,6
+731,8
@@
static int __init bt_init(void)
bt_debugfs = debugfs_create_dir("bluetooth", NULL);
bt_debugfs = debugfs_create_dir("bluetooth", NULL);
+ bt_leds_init();
+
err = bt_sysfs_init();
if (err < 0)
return err;
err = bt_sysfs_init();
if (err < 0)
return err;
@@
-785,6
+792,8
@@
static void __exit bt_exit(void)
bt_sysfs_cleanup();
bt_sysfs_cleanup();
+ bt_leds_cleanup();
+
debugfs_remove_recursive(bt_debugfs);
}
debugfs_remove_recursive(bt_debugfs);
}
@@
-792,7
+801,7
@@
subsys_initcall(bt_init);
module_exit(bt_exit);
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
module_exit(bt_exit);
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("Bluetooth Core ver "
BT_SUBSYS_
VERSION);
-MODULE_VERSION(
BT_SUBSYS_
VERSION);
+MODULE_DESCRIPTION("Bluetooth Core ver " VERSION);
+MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_ALIAS_NETPROTO(PF_BLUETOOTH);
MODULE_LICENSE("GPL");
MODULE_ALIAS_NETPROTO(PF_BLUETOOTH);