Merge branch 'sched/urgent' into sched/core

Merge reason: Merge dependent fix, update to latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 015dfb2a80da..f35371db33f5 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -208,6 +208,7 @@ static struct s3c2410_nand_set __initdata osiris_nand_sets[] = {
                 .name           = "External",
                 .nr_chips       = 1,
                 .nr_map         = external_map,
+                .options        = NAND_SCAN_SILENT_NODEV,
                 .nr_partitions  = ARRAY_SIZE(osiris_default_nand_part),
                 .partitions     = osiris_default_nand_part,
         },
@@ -222,6 +223,7 @@ static struct s3c2410_nand_set __initdata osiris_nand_sets[] = {
                 .name           = "chip1",
                 .nr_chips       = 1,
                 .nr_map         = chip1_map,
+                .options        = NAND_SCAN_SILENT_NODEV,
                 .nr_partitions  = ARRAY_SIZE(osiris_default_nand_part),
                 .partitions     = osiris_default_nand_part,
         },