diff options
| author | Linus Torvalds | 2010-08-05 17:53:20 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-05 17:53:20 +0200 |
| commit | c3d1f1746b966907ba5ad2f75ddca24db8b21147 (patch) | |
| tree | 548a25e104d8bdb906030b8d3bf78fbfde0e5817 /drivers/mtd/nand/Kconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 (diff) | |
| parent | MIPS: PowerTV: Separate PowerTV USB support from non-USB code (diff) | |
| download | kernel-qcow2-linux-c3d1f1746b966907ba5ad2f75ddca24db8b21147.tar.gz kernel-qcow2-linux-c3d1f1746b966907ba5ad2f75ddca24db8b21147.tar.xz kernel-qcow2-linux-c3d1f1746b966907ba5ad2f75ddca24db8b21147.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
MIPS: PowerTV: Separate PowerTV USB support from non-USB code
MIPS: strip the un-needed sections of vmlinuz
MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
MIPS: Clean up arch/mips/boot/compressed/decompress.c
MIPS: Clean up arch/mips/boot/compressed/ld.script
MIPS: Unify the suffix of compressed vmlinux.bin
MIPS: PowerTV: Add Gaia platform definitions.
MIPS: BCM47xx: Fix nvram_getenv return value.
MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
MIPS: Clean up notify_die() usage.
MIPS: Remove unused task_struct.trap_no field.
Documentation: Mention that KProbes is supported on MIPS
SAMPLES: kprobe_example: Make it print something on MIPS.
MIPS: kprobe: Add support.
MIPS: Add instrunction format for BREAK and SYSCALL
MIPS: kprobes: Define regs_return_value()
MIPS: Ritually kill stupid printk.
MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
MIPS: Octeon: Support 256 MSI on PCIe
MIPS: Decode core number for R2 CPUs.
...
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index ffc3720929f1..362d177efe1b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -526,4 +526,10 @@ config MTD_NAND_NUC900 This enables the driver for the NAND Flash on evaluation board based on w90p910 / NUC9xx. +config MTD_NAND_JZ4740 + tristate "Support for JZ4740 SoC NAND controller" + depends on MACH_JZ4740 + help + Enables support for NAND Flash on JZ4740 SoC based boards. + endif # MTD_NAND |