diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 09:41:27 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 09:41:27 +0400 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /arch/powerpc/configs/mpc83xx_defconfig | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.xz | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/configs/mpc83xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc83xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9352e4430c3b..09116c6a6719 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig @@ -50,7 +50,6 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y |