diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-12 07:37:49 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-12 07:37:49 -0700 |
| commit | 48381b3b0239d26600f730d7c6a62c89f5c27e9a (patch) | |
| tree | 6eb85c461c09573924df852db3959830e5d86af0 /drivers/mtd | |
| parent | cbe151c53d5efa99085c537bc1d8a8c6a08933ad (diff) | |
| parent | 7ccfbeceea23c64d110cf8f77803f12d0bcee787 (diff) | |
Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-v3.18-android
* 'android-3.18' of https://android.googlesource.com/kernel/common: (560 commits)
nf: IDLETIMER: Fix broken uid field in the msg
UPSTREAM: staging: android: Assign bool to true
UPSTREAM: Staging: android: ion: fix typos in comments
UPSTREAM: staging: android: ion: Replace "the the " with "the"
usb: gadget: Do not disconnect unregistered dev
ipv4: Missing sk_nulls_node_init() in ping_unhash().
arm64: fix ftrace due to bad cherry-picks from mainline v3.19
SELinux: ss: Fix policy write for ioctl operations
nf: IDLETIMER: Adds the uid field in the msg
arm64: ptrace: add NT_ARM_SYSTEM_CALL regset
android: configs: Enable SELinux and its dependencies.
arm64: add seccomp support
arm64: add SIGSYS siginfo for compat task
arm64: add seccomp syscall for compat task
asm-generic: add generic seccomp.h for secure computing mode 1
arm64: ptrace: allow tracer to skip a system call
arm64: entry: avoid writing lr explicitly for constructing return paths
Revert "arm64: ptrace: add PTRACE_SET_SYSCALL"
Revert "arm64: ptrace: allow tracer to skip a system call"
Revert "asm-generic: add generic seccomp.h for secure computing mode 1"
...
Conflicts:
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpuinfo.c
arch/arm64/kernel/setup.c
drivers/clk/clk.c
Conflict Resolution Summary:
Conflict:
Upstream commit 44b82b7700d0 (arm64: Fix up /proc/cpuinfo) exists in
the Android tree as commit 93f223009750 (arm64: Fix up /proc/cpuinfo),
but the android commit has a call to dump_stack_set_arch_desc() in
setup_machine_fdt() that doesn't exist upstream.
Resolution: leave the extra call.
Conflict:
Upstream commit 04597a65c5ef (arm64: Track system support for mixed
endian EL0) picked into Android tree as commit d11d7e575ba2 (arm64:
Track system support for mixed endian EL0) causing some trivial
add-add conflicts between this and the arm64 errata framework which
was pulled in from stable/3.18.y
Resolution: add both sides
Conflict:
Android commit 3a3804ba0a4a (clk: debugfs: Support frequency stats
accounting), which is not upstream, had some trivial add-add conflicts
with upstream commit af33873cc77b (clk: Fix debugfs clk removal before
inited).
Resolution: add both sides
Conflict:
Minor conflict between upstream commit af33873cc77b (clk: Fix debugfs
clk removal before inited) and android commit 3a3804ba0a4a (clk:
debugfs: Support frequency stats accounting) because android commit
applied to upstream before the fix was applied.
Resolution: remove stray comment.
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index dd10646982ae..0f7c07abc3e7 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -1,3 +1,10 @@ +config MTD_NAND_IDS + tristate "Include chip ids for known NAND devices." + depends on MTD + help + Useful for NAND drivers that do not use the NAND subsystem but + still like to take advantage of the known chip information. + config MTD_NAND_ECC tristate @@ -109,9 +116,6 @@ config MTD_NAND_OMAP_BCH config MTD_NAND_OMAP_BCH_BUILD def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH -config MTD_NAND_IDS - tristate - config MTD_NAND_RICOH tristate "Ricoh xD card reader" default n |