diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /arch/powerpc/configs/ppc44x_defconfig | |
| parent | gma500: Final enables for Oaktrail (diff) | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.tar.xz linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.zip | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'arch/powerpc/configs/ppc44x_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc44x_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig index 6cdf1c0d2c8a..3b98d7354341 100644 --- a/arch/powerpc/configs/ppc44x_defconfig +++ b/arch/powerpc/configs/ppc44x_defconfig @@ -52,6 +52,8 @@ CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_NDFC=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_GLUEBI=m CONFIG_PROC_DEVICETREE=y |