diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/bio.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 35dcdb3589bc..ce33e6868a2f 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
| @@ -304,7 +304,6 @@ struct biovec_slab { | |||
| 304 | }; | 304 | }; |
| 305 | 305 | ||
| 306 | extern struct bio_set *fs_bio_set; | 306 | extern struct bio_set *fs_bio_set; |
| 307 | extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; | ||
| 308 | 307 | ||
| 309 | /* | 308 | /* |
| 310 | * a small number of entries is fine, not going to be performance critical. | 309 | * a small number of entries is fine, not going to be performance critical. |