diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:33:05 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:33:05 +0200 |
commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
tree | eb2060681552a00e9efa98224b95f69a3dc84390 /fs/partitions/check.c | |
parent | Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-... (diff) | |
parent | ARM: DaVinci: evm sets up many devices (diff) | |
download | linux-c97f68145e8067b3ac4b126a6faebf90f9ffc302.tar.xz linux-c97f68145e8067b3ac4b126a6faebf90f9ffc302.zip |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'fs/partitions/check.c')
-rw-r--r-- | fs/partitions/check.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 7d6b34e201db..ecc3330972e5 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -499,9 +499,9 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) if (!size) continue; if (from + size > get_capacity(disk)) { - printk(KERN_ERR " %s: p%d exceeds device capacity\n", + printk(KERN_WARNING + "%s: p%d exceeds device capacity\n", disk->disk_name, p); - continue; } res = add_partition(disk, p, from, size, state->parts[p].flags); if (res) { |