Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Fri, 26 Mar 2010 14:55:59 +0000 (14:55 +0000)]
Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().

12 files changed:
1  2 
MAINTAINERS
arch/arm/mach-ep93xx/include/mach/ts72xx.h
arch/arm/mach-ep93xx/ts72xx.c
drivers/mtd/inftlcore.c
drivers/mtd/maps/pismo.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/au1550nd.c
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/omap2.c
drivers/mtd/nand/sh_flctl.c
lib/idr.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -452,16 -442,9 +452,16 @@@ config MTD_NAND_FSL_UP
          Enables support for NAND Flash chips wired onto Freescale PowerPC
          processor localbus with User-Programmable Machine support.
  
 +config MTD_NAND_MPC5121_NFC
 +      tristate "MPC5121 built-in NAND Flash Controller support"
 +      depends on PPC_MPC512x
 +      help
 +        This enables the driver for the NAND flash controller on the
 +        MPC5121 SoC.
 +
  config MTD_NAND_MXC
        tristate "MXC NAND support"
-       depends on ARCH_MX2 || ARCH_MX3
+       depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
        help
          This enables the driver for the NAND flash controller on the
          MXC processors.
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -825,7 -849,12 +849,12 @@@ static int __devinit flctl_probe(struc
        nand->select_chip = flctl_select_chip;
        nand->cmdfunc = flctl_cmdfunc;
  
+       if (pdata->flcmncr_val & SEL_16BIT) {
+               nand->options |= NAND_BUSWIDTH_16;
+               nand->read_word = flctl_read_word;
+       }
 -      ret = nand_scan_ident(flctl_mtd, 1);
 +      ret = nand_scan_ident(flctl_mtd, 1, NULL);
        if (ret)
                goto err;
  
diff --cc lib/idr.c
Simple merge