diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
| commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
| tree | bdcd6158758fe1810f0ddddb80d2816779518688 /fs/qnx4 | |
| parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/bitmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index 9912539276..46efbf52cb 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c | |||
| @@ -23,10 +23,12 @@ | |||
| 23 | #include <linux/buffer_head.h> | 23 | #include <linux/buffer_head.h> |
| 24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
| 25 | 25 | ||
| 26 | #if 0 | ||
| 26 | int qnx4_new_block(struct super_block *sb) | 27 | int qnx4_new_block(struct super_block *sb) |
| 27 | { | 28 | { |
| 28 | return 0; | 29 | return 0; |
| 29 | } | 30 | } |
| 31 | #endif /* 0 */ | ||
| 30 | 32 | ||
| 31 | static void count_bits(register const char *bmPart, register int size, | 33 | static void count_bits(register const char *bmPart, register int size, |
| 32 | int *const tf) | 34 | int *const tf) |