diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/configs/yl9200_defconfig | |
| parent | xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/configs/yl9200_defconfig')
| -rw-r--r-- | arch/arm/configs/yl9200_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/yl9200_defconfig b/arch/arm/configs/yl9200_defconfig index 26de37f74686..a9f41c24c9dc 100644 --- a/arch/arm/configs/yl9200_defconfig +++ b/arch/arm/configs/yl9200_defconfig @@ -421,7 +421,7 @@ CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=y -CONFIG_MTD_NAND_AT91=y +CONFIG_MTD_NAND_ATMEL=y # CONFIG_MTD_NAND_NANDSIM is not set CONFIG_MTD_NAND_PLATFORM=y # CONFIG_MTD_ALAUDA is not set |