diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
| commit | c00aafcd4977769e8728292302ddbbb8b1082fab (patch) | |
| tree | 5766bcfbfd7b24816b54298b8ef34054f8cf0fae /net/bluetooth/rfcomm/sock.c | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 7f482784e9f7..0b85e8116859 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
| @@ -1132,7 +1132,7 @@ error: | |||
| 1132 | return err; | 1132 | return err; |
| 1133 | } | 1133 | } |
| 1134 | 1134 | ||
| 1135 | void __exit rfcomm_cleanup_sockets(void) | 1135 | void rfcomm_cleanup_sockets(void) |
| 1136 | { | 1136 | { |
| 1137 | class_remove_file(bt_class, &class_attr_rfcomm); | 1137 | class_remove_file(bt_class, &class_attr_rfcomm); |
| 1138 | 1138 | ||