diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /fs/qnx4 | |
parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) |
Merge with /home/shaggy/git/linus-clean/
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) |