Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm...

[mirror_ubuntu-artful-kernel.git] / drivers / i2c / i2c-core.c

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 3a1bc9c4efc7e8e3552b7c559eea19233a9c199d..cf9e396d7702c6c769e2106a6938f90c6ddbb7a9 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -30,7 +30,7 @@
 #define pr_fmt(fmt) "i2c-core: " fmt
 
 #include <dt-bindings/i2c/i2c.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/acpi.h>
 #include <linux/clk/clk-conf.h>
 #include <linux/completion.h>
@@ -80,9 +80,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
 static struct static_key i2c_trace_msg = STATIC_KEY_INIT_FALSE;
 static bool is_registered;
 
-void i2c_transfer_trace_reg(void)
+int i2c_transfer_trace_reg(void)
 {
        static_key_slow_inc(&i2c_trace_msg);
+       return 0;
 }
 
 void i2c_transfer_trace_unreg(void)