diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:29:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:29:54 -0400 |
| commit | 623fa579e61f250c1913c70257ef3a753820bb68 (patch) | |
| tree | 179fcff4a0469bfa9a9ce5cab14fff6141810cd0 /arch/arm/configs/at91sam9g20ek_defconfig | |
| parent | d65f5c5803d9cd6fa0b540a0dddf956be671bc36 (diff) | |
| parent | e4c094a595ba8ea402e6b2153f7bbf6ef039eea0 (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[MTD] [NAND] drivers/mtd/nand/nandsim.c: fix printk warnings
[MTD] [NAND] Blackfin NFC Driver: Cleanup the error exit path of bf5xx_nand_probe function
[MTD] [NAND] Blackfin NFC Driver: use standard dev_err() rather than printk()
[MTD] [NAND] Blackfin NFC Driver: enable Blackfin nand HWECC support by default
[MTD] [NAND] Blackfin NFC Driver: add proper devinit/devexit markings to probe/remove functions
[MTD] [NAND] Blackfin NFC Driver: add support for the ECC layout the Blackfin bootrom uses
[MTD] [NAND] Blackfin NFC Driver: fix bug - hw ecc calc by making sure we extract 11 bits from each register instead of 10
[MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first 256 bytes if operating on 512 pages
[MTD] [NAND] diskonchip.c fix sparse endian warnings
[MTD] [NAND] drivers/mtd/nand/nandsim.c needs div64.h
[JFFS2] Fix allocation of summary buffer
Fix rename of at91_nand -> atmel_nand
[MTD] [NOR] drivers/mtd/chips/jedec_probe.c: fix Am29DL800BB device ID
[MTD] MTD_DEBUG always does compile-time typechecks
[MTD] DataFlash: bugfix, binary page sizes now handled
[MTD] [NAND] fsl_elbc_nand.c: fix printk warning
[MTD] [NAND] nandsim: support random page read command
[MTD] [NAND] fix subpage read for small page NAND
Diffstat (limited to 'arch/arm/configs/at91sam9g20ek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index c06863847364..df0d6ee672b3 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
| @@ -168,7 +168,7 @@ CONFIG_MACH_AT91SAM9G20EK=y | |||
| 168 | # AT91 Board Options | 168 | # AT91 Board Options |
| 169 | # | 169 | # |
| 170 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set | 170 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
| 171 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 171 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
| 172 | 172 | ||
| 173 | # | 173 | # |
| 174 | # AT91 Feature Selections | 174 | # AT91 Feature Selections |
| @@ -442,10 +442,10 @@ CONFIG_MTD_NAND=y | |||
| 442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
| 443 | CONFIG_MTD_NAND_IDS=y | 443 | CONFIG_MTD_NAND_IDS=y |
| 444 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 444 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 445 | CONFIG_MTD_NAND_AT91=y | 445 | CONFIG_MTD_NAND_ATMEL=y |
| 446 | CONFIG_MTD_NAND_AT91_ECC_SOFT=y | 446 | CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y |
| 447 | # CONFIG_MTD_NAND_AT91_ECC_HW is not set | 447 | # CONFIG_MTD_NAND_ATMEL_ECC_HW is not set |
| 448 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 448 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
| 449 | # CONFIG_MTD_NAND_NANDSIM is not set | 449 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 450 | # CONFIG_MTD_NAND_PLATFORM is not set | 450 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 451 | # CONFIG_MTD_ALAUDA is not set | 451 | # CONFIG_MTD_ALAUDA is not set |