diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /include/linux/module.h | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 330bec08c2c4..819c4e889bf1 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -567,8 +567,7 @@ static inline void print_modules(void) | |||
| 567 | { | 567 | { |
| 568 | } | 568 | } |
| 569 | 569 | ||
| 570 | static inline void module_update_markers(struct module *probe_module, | 570 | static inline void module_update_markers(void) |
| 571 | int *refcount) | ||
| 572 | { | 571 | { |
| 573 | } | 572 | } |
| 574 | 573 | ||