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

[linux-2.6] / drivers / mtd / maps / cfi_flagadm.c

diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index 92b5d883d7b0e4f8b4ad978a6fac2a9c44c2bfc4..65e5ee552010be7a4c147a34f806ac3d9a5e46d0 100644 (file)
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = {
                .size =         FLASH_PARTITION2_SIZE
        },
        {
-               .name =         "Persistant storage",
+               .name =         "Persistent storage",
                .offset =       FLASH_PARTITION3_ADDR,
                .size =         FLASH_PARTITION3_SIZE
        }