From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 26 Mar 2010 14:55:59 +0000 (+0000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=329f9052dbadf6f4afe2231668bd00c579a4aa10;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/nand/sh_flctl.c

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

329f9052dbadf6f4afe2231668bd00c579a4aa10
diff --cc drivers/mtd/inftlcore.c
index 015a7fe1b6ee,8aca5523a337..015a7fe1b6ee
mode 100755,100644..100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
diff --cc drivers/mtd/nand/Kconfig
index 226206e06230,42e5ea49e975..164bd56b9d1a
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -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.
diff --cc drivers/mtd/nand/sh_flctl.c
index dbc09a81866e,1842df8bdd93..88c802cd947f
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@@ -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;