diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
tree | f292930065e6c860714c134790ab8882680ac739 /security/device_cgroup.c | |
parent | ARM: mach-shmobile: add framebuffer support for ap4evb (diff) | |
parent | fbmem: avoid printk format warning with 32-bit resources (diff) | |
download | linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.tar.xz linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r-- | security/device_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index f77c60423992..8d9c48f13774 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -470,7 +470,7 @@ struct cgroup_subsys devices_subsys = { .name = "devices", .can_attach = devcgroup_can_attach, .create = devcgroup_create, - .destroy = devcgroup_destroy, + .destroy = devcgroup_destroy, .populate = devcgroup_populate, .subsys_id = devices_subsys_id, }; |