diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /include/linux/writeback.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 9c1ed1fb6ddb..93445477f86a 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -168,8 +168,6 @@ void writeback_set_ratelimit(void); | |||
| 168 | /* pdflush.c */ | 168 | /* pdflush.c */ |
| 169 | extern int nr_pdflush_threads; /* Global so it can be exported to sysctl | 169 | extern int nr_pdflush_threads; /* Global so it can be exported to sysctl |
| 170 | read-only. */ | 170 | read-only. */ |
| 171 | extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */ | ||
| 172 | extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */ | ||
| 173 | 171 | ||
| 174 | 172 | ||
| 175 | #endif /* WRITEBACK_H */ | 173 | #endif /* WRITEBACK_H */ |