diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /include/linux/writeback.h | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index d5c3fe1bf33d..542dbaee6512 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -85,7 +85,7 @@ static inline void wait_on_inode(struct inode *inode) | |||
| 85 | /* | 85 | /* |
| 86 | * mm/page-writeback.c | 86 | * mm/page-writeback.c |
| 87 | */ | 87 | */ |
| 88 | int wakeup_bdflush(long nr_pages); | 88 | int wakeup_pdflush(long nr_pages); |
| 89 | void laptop_io_completion(void); | 89 | void laptop_io_completion(void); |
| 90 | void laptop_sync_completion(void); | 90 | void laptop_sync_completion(void); |
| 91 | void throttle_vm_writeout(void); | 91 | void throttle_vm_writeout(void); |