diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
| commit | 2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb (patch) | |
| tree | 4b3bb0f76c15264fe7d4cced91127f3d96ff31f5 /include/linux/module.h | |
| parent | 9cb543124a2d31af42ce61a4c30765ecc8e5f1fa (diff) | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 7760c6d344a3..1375ee3f03aa 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -199,11 +199,11 @@ struct module_use { | |||
| 199 | struct module *source, *target; | 199 | struct module *source, *target; |
| 200 | }; | 200 | }; |
| 201 | 201 | ||
| 202 | enum module_state | 202 | enum module_state { |
| 203 | { | 203 | MODULE_STATE_LIVE, /* Normal state. */ |
| 204 | MODULE_STATE_LIVE, | 204 | MODULE_STATE_COMING, /* Full formed, running module_init. */ |
| 205 | MODULE_STATE_COMING, | 205 | MODULE_STATE_GOING, /* Going away. */ |
| 206 | MODULE_STATE_GOING, | 206 | MODULE_STATE_UNFORMED, /* Still setting it up. */ |
| 207 | }; | 207 | }; |
| 208 | 208 | ||
| 209 | /** | 209 | /** |