diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/linux/module.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 05f2447f8c15..15cd6b1b211e 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -367,9 +367,6 @@ struct module | |||
| 367 | /* What modules do I depend on? */ | 367 | /* What modules do I depend on? */ |
| 368 | struct list_head target_list; | 368 | struct list_head target_list; |
| 369 | 369 | ||
| 370 | /* Who is waiting for us to be unloaded */ | ||
| 371 | struct task_struct *waiter; | ||
| 372 | |||
| 373 | /* Destruction function. */ | 370 | /* Destruction function. */ |
| 374 | void (*exit)(void); | 371 | void (*exit)(void); |
| 375 | 372 | ||
