diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-04-22 13:29:19 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-04-22 13:29:19 -0400 |
| commit | 3e550d2396d9deef77328237ed992e19dcfefca5 (patch) | |
| tree | 953c7e2d7fb69e18a117b2155cccd39f6aa06465 /drivers/mtd | |
| parent | 81a1209c90914cbf5639a2bc9a325d9821f89faa (diff) | |
| parent | 5e0899db69e27abfdc1c6223ca74f479acdedaa6 (diff) | |
Merge MTD fixes from 4.0 into -next
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 5b76a173cd95..5897d8d8fa5a 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -526,6 +526,7 @@ config MTD_NAND_SUNXI | |||
| 526 | 526 | ||
| 527 | config MTD_NAND_HISI504 | 527 | config MTD_NAND_HISI504 |
| 528 | tristate "Support for NAND controller on Hisilicon SoC Hip04" | 528 | tristate "Support for NAND controller on Hisilicon SoC Hip04" |
| 529 | depends on HAS_DMA | ||
| 529 | help | 530 | help |
| 530 | Enables support for NAND controller on Hisilicon SoC Hip04. | 531 | Enables support for NAND controller on Hisilicon SoC Hip04. |
| 531 | 532 | ||