Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[sfrench/cifs-2.6.git] / security / device_cgroup.c

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index d9d69e6930edf5266e1c2bc77fff39528fee5467..188c1d26393b56bfd13814e7834119a440410114 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -796,7 +796,7 @@ struct cgroup_subsys devices_cgrp_subsys = {
        .css_free = devcgroup_css_free,
        .css_online = devcgroup_online,
        .css_offline = devcgroup_offline,
-       .base_cftypes = dev_cgroup_files,
+       .legacy_cftypes = dev_cgroup_files,
 };
 
 /**