diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /kernel/softirq.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 215541e26c1a..0f08a84ae307 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -311,8 +311,6 @@ void open_softirq(int nr, void (*action)(struct softirq_action*), void *data) | |||
| 311 | softirq_vec[nr].action = action; | 311 | softirq_vec[nr].action = action; |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | EXPORT_SYMBOL(open_softirq); | ||
| 315 | |||
| 316 | /* Tasklets */ | 314 | /* Tasklets */ |
| 317 | struct tasklet_head | 315 | struct tasklet_head |
| 318 | { | 316 | { |