diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:11 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:20 -0500 |
| commit | 6b914c998787d65022e80d6262dfd0edef58cadb (patch) | |
| tree | ec9d9605ae08e6e40664c4302a181979ab4fe1d3 /include/linux/module.h | |
| parent | 1f87a404d02a96519284e1928445ca5cfe9667db (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
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 | /** |
