diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-19 04:33:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-19 04:33:25 -0400 |
| commit | d2805395aadc105d7228511eb0f42d9eea912003 (patch) | |
| tree | a97b491304831cfc809d1f3d1bcf5280b15bbe8d /net/bluetooth/sco.c | |
| parent | f3b9605d744df537dee10fd06630f35a62b343ec (diff) | |
| parent | 63fbd24e5102eecfc9d049ed7f4be7f9a25f814f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 8cda49874868..a16011fedc1d 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -1002,7 +1002,7 @@ module_exit(sco_exit); | |||
| 1002 | module_param(disable_esco, bool, 0644); | 1002 | module_param(disable_esco, bool, 0644); |
| 1003 | MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation"); | 1003 | MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation"); |
| 1004 | 1004 | ||
| 1005 | MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); | 1005 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
| 1006 | MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); | 1006 | MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); |
| 1007 | MODULE_VERSION(VERSION); | 1007 | MODULE_VERSION(VERSION); |
| 1008 | MODULE_LICENSE("GPL"); | 1008 | MODULE_LICENSE("GPL"); |