diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /include/linux/connector.h | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index da6dd957f908..96a89d3d6727 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -170,7 +170,5 @@ int cn_cb_equal(struct cb_id *, struct cb_id *); | |||
| 170 | 170 | ||
| 171 | void cn_queue_wrapper(struct work_struct *work); | 171 | void cn_queue_wrapper(struct work_struct *work); |
| 172 | 172 | ||
| 173 | extern int cn_already_initialized; | ||
| 174 | |||
| 175 | #endif /* __KERNEL__ */ | 173 | #endif /* __KERNEL__ */ |
| 176 | #endif /* __CONNECTOR_H */ | 174 | #endif /* __CONNECTOR_H */ |