Merge remote-tracking branch 'origin/master' into perf/core

[sfrench/cifs-2.6.git] / arch / x86 / events / intel / uncore.c

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 1db6a7113bdb7fc35bce58f86e65840518cecc10..357258f82dc85998f0591a5406aade8c4e822bd0 100644 (file)
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -94,8 +94,8 @@ end:
        return map;
 }
 
-ssize_t uncore_event_show(struct kobject *kobj,
-                         struct kobj_attribute *attr, char *buf)
+ssize_t uncore_event_show(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
        struct uncore_event_desc *event =
                container_of(attr, struct uncore_event_desc, attr);