Merge branch 'master' into for-next

[cascardo/linux.git] / arch / mips / emma / markeins / platform.c

diff --git a/arch/mips/emma/markeins/platform.c b/arch/mips/emma/markeins/platform.c
index b05b08b..99ea004 100644 (file)
--- a/arch/mips/emma/markeins/platform.c
+++ b/arch/mips/emma/markeins/platform.c
@@ -190,7 +190,7 @@ static struct platform_device markeins_flash_device = {
        .name           = "physmap-flash",
        .id             = 0,
        .dev            = {
-               .platform_data  = &markeins_flash_data,
+               .platform_data  = &markeins_flash_data,
        },
        .num_resources  = 1,
        .resource       = &markeins_flash_resource,