mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Fix kernel-doc parameter name typo in blk-settings.c: block: rename CONFIG_LBD to CONFIG_LBDAF block: Fix bounce_pfn setting hd: stop defining MAJOR_NR
This commit is contained in:
commit
31583d6acf
16 changed files with 25 additions and 27 deletions
|
|
@ -990,7 +990,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
|
|||
sb->s_id, n_blocks_count);
|
||||
if (sizeof(sector_t) < 8)
|
||||
ext3_warning(sb, __func__,
|
||||
"CONFIG_LBD not enabled\n");
|
||||
"CONFIG_LBDAF not enabled\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1812,7 +1812,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
|
|||
printk(KERN_ERR "EXT3-fs: filesystem on %s:"
|
||||
" too large to mount safely\n", sb->s_id);
|
||||
if (sizeof(sector_t) < 8)
|
||||
printk(KERN_WARNING "EXT3-fs: CONFIG_LBD not "
|
||||
printk(KERN_WARNING "EXT3-fs: CONFIG_LBDAF not "
|
||||
"enabled\n");
|
||||
goto failed_mount;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue