Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / include / linux / coresight.h

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 46c67a7648778d8e7e1b0793bd8683567d132fce..7b87965f7a65c90d8e98f11b14ab5b5b1f967abb 100644 (file)
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -154,8 +154,9 @@ struct coresight_connection {
  * @orphan:    true if the component has connections that haven't been linked.
  * @enable:    'true' if component is currently part of an active path.
  * @activated: 'true' only if a _sink_ has been activated.  A sink can be
-               activated but not yet enabled.  Enabling for a _sink_
-               happens when a source has been selected for that it.
+ *             activated but not yet enabled.  Enabling for a _sink_
+ *             appens when a source has been selected for that it.
+ * @ea:                Device attribute for sink representation under PMU directory.
  */
 struct coresight_device {
        struct coresight_connection *conns;
@@ -168,7 +169,9 @@ struct coresight_device {
        atomic_t *refcnt;
        bool orphan;
        bool enable;    /* true only if configured as part of a path */
+       /* sink specific fields */
        bool activated; /* true only if a sink is part of a path */
+       struct dev_ext_attribute *ea;
 };
 
 #define to_coresight_device(d) container_of(d, struct coresight_device, dev)