Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[firefly-linux-kernel-4.4.55.git] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index d86e215ca2b823f6f37a87c5b0e5c0b72b4b3b3b..3bff9ce09cf7b92fcd04fb06c19864b0a07df91b 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -39,7 +39,7 @@ extern int cgroupstats_build(struct cgroupstats *stats,
 extern int cgroup_load_subsys(struct cgroup_subsys *ss);
 extern void cgroup_unload_subsys(struct cgroup_subsys *ss);
 
-extern const struct file_operations proc_cgroup_operations;
+extern int proc_cgroup_show(struct seq_file *, void *);
 
 /*
  * Define the enumeration of all cgroup subsystems.
@@ -586,7 +586,6 @@ struct cgroup_subsys {
        void (*bind)(struct cgroup *root);
 
        int subsys_id;
-       int active;
        int disabled;
        int early_init;
        /*