diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /include/linux/reiserfs_fs.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'include/linux/reiserfs_fs.h')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 0a3842aacba9..eca75df00fed 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
| @@ -1557,7 +1557,7 @@ struct tree_balance { | |||
| 1557 | /* When inserting an item. */ | 1557 | /* When inserting an item. */ |
| 1558 | #define M_INSERT 'i' | 1558 | #define M_INSERT 'i' |
| 1559 | /* When inserting into (directories only) or appending onto an already | 1559 | /* When inserting into (directories only) or appending onto an already |
| 1560 | existant item. */ | 1560 | existent item. */ |
| 1561 | #define M_PASTE 'p' | 1561 | #define M_PASTE 'p' |
| 1562 | /* When deleting an item. */ | 1562 | /* When deleting an item. */ |
| 1563 | #define M_DELETE 'd' | 1563 | #define M_DELETE 'd' |