diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:49:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 16:49:17 -0500 |
| commit | f4f314bf6fd39d85065c3fcda27bd594163abcf0 (patch) | |
| tree | 2b88d345b2563e51c196b038ff5f74b94c77b2e0 /net/bluetooth/cmtp/core.c | |
| parent | c269a20393500e84e8cbae23ca6d65e1107433c4 (diff) | |
| parent | 8ffd878419839638d1aea102455b575da39c1a62 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/cmtp/core.c')
| -rw-r--r-- | net/bluetooth/cmtp/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 2cee71a714c4..964ea9126f9f 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -469,8 +469,6 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci) static int __init cmtp_init(void) { - l2cap_load(); - BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION); cmtp_init_sockets(); |