diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
tree | 255f862839c593c796e609328575b611e3f56cf3 /include/linux/writeback.h | |
parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) |
Auto merge with /home/aegl/GIT/linus
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); |