Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / fs / partitions / ldm.c

diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
index c387812537d7450e1fb6e7bedf3ca6e407e93eab..99873a2b4cbcd749574e874757af92e9b418c1a2 100644 (file)
--- a/fs/partitions/ldm.c
+++ b/fs/partitions/ldm.c
@@ -158,7 +158,7 @@ static bool ldm_parse_privhead(const u8 *data, struct privhead *ph)
                /* Warn the user and continue, carefully. */
                ldm_info("Database is normally %u bytes, it claims to "
                        "be %llu bytes.", LDM_DB_SIZE,
-                       udunsigned long long)ph->config_size);
+                       (unsigned long long)ph->config_size);
        }
        if ((ph->logical_disk_size == 0) || (ph->logical_disk_start +
                        ph->logical_disk_size > ph->config_start)) {