Merge branch 'sh/driver-core' into sh/clkfwk

1 files changed, 3 insertions, 1 deletions

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index dd8f6ec57dce..f93b939539bc 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -953,7 +953,9 @@ drop:
         return 0;
 }
 
-static ssize_t sco_sysfs_show(struct class *dev, char *buf)
+static ssize_t sco_sysfs_show(struct class *dev,
+                                struct class_attribute *attr,
+                                char *buf)
 {
         struct sock *sk;
         struct hlist_node *node;