Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 623fa579 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d65f5c58 e4c094a5

arch/arm/configs/at91cap9adk_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ CONFIG_MACH_AT91CAP9ADK=y 
# AT91 Board Options

#

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set

# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set



#

# AT91 Feature Selections
@@ -442,7 +442,7 @@ CONFIG_MTD_NAND=y 
# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

CONFIG_MTD_NAND_AT91=y

CONFIG_MTD_NAND_ATMEL=y

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

# CONFIG_MTD_ALAUDA is not set

arch/arm/configs/at91sam9260ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ CONFIG_MACH_AT91SAM9260EK=y 
# AT91 Board Options

#

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set

# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set

# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set



#

# AT91 Feature Selections

arch/arm/configs/at91sam9261ek_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9261EK=y 
# AT91 Board Options

#

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set

# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set

# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set



#

# AT91 Feature Selections
@@ -433,7 +433,7 @@ CONFIG_MTD_NAND=y 
# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

CONFIG_MTD_NAND_AT91=y

CONFIG_MTD_NAND_ATMEL=y

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

# CONFIG_MTD_ALAUDA is not set

arch/arm/configs/at91sam9263ek_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9263EK=y 
# AT91 Board Options

#

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set

# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set



#

# AT91 Feature Selections
@@ -428,7 +428,7 @@ CONFIG_MTD_NAND=y 
# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

CONFIG_MTD_NAND_AT91=y

CONFIG_MTD_NAND_ATMEL=y

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

# CONFIG_MTD_ALAUDA is not set

arch/arm/configs/at91sam9g20ek_defconfig

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ CONFIG_MACH_AT91SAM9G20EK=y 
# AT91 Board Options

#

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set

# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set

# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set



#

# AT91 Feature Selections
@@ -442,10 +442,10 @@ CONFIG_MTD_NAND=y 
# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

CONFIG_MTD_NAND_AT91=y

CONFIG_MTD_NAND_AT91_ECC_SOFT=y

# CONFIG_MTD_NAND_AT91_ECC_HW is not set

# CONFIG_MTD_NAND_AT91_ECC_NONE is not set

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y

# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set

# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

# CONFIG_MTD_ALAUDA is not set