diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 19:52:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 19:52:18 +0300 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /Documentation/filesystems/configfs/configfs_example.c | |
| parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
| download | linux-b05005772f34497eb2b7415a651fe785cbe70e16.tar.xz | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'Documentation/filesystems/configfs/configfs_example.c')
| -rw-r--r-- | Documentation/filesystems/configfs/configfs_example.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c index f3c6e4946f98..3d4713a6c207 100644 --- a/Documentation/filesystems/configfs/configfs_example.c +++ b/Documentation/filesystems/configfs/configfs_example.c @@ -320,6 +320,7 @@ static struct config_item_type simple_children_type = { .ct_item_ops = &simple_children_item_ops, .ct_group_ops = &simple_children_group_ops, .ct_attrs = simple_children_attrs, + .ct_owner = THIS_MODULE, }; static struct configfs_subsystem simple_children_subsys = { @@ -403,6 +404,7 @@ static struct config_item_type group_children_type = { .ct_item_ops = &group_children_item_ops, .ct_group_ops = &group_children_group_ops, .ct_attrs = group_children_attrs, + .ct_owner = THIS_MODULE, }; static struct configfs_subsystem group_children_subsys = { |