Merge tag 'mtd/fixes-for-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

4e73079d · Linus Torvalds <[email protected]> · 2019-08-29 09:09:44 -07:00

Pull mtd fix from Miquel Raynal:
 "Add a 'depends on' in the core Hyperbus Kconfig entry to avoid build
  errors"

* tag 'mtd/fixes-for-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: hyperbus: fix dependency and build error

Commit: 4e73079d39f62a5a46fbc30260acb0bd890c28df
Parents: 9cf6b756 · dc9cfd26

Merge commit. Changes below are compared with the first parent: 9cf6b756.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/mtd/hyperbus/Kconfig	modified	+1	−0	View file

drivers/mtd/hyperbus/Kconfig

View file

diff --git a/drivers/mtd/hyperbus/Kconfig b/drivers/mtd/hyperbus/Kconfig
index b4e3caf..a4d8968 100644
--- a/drivers/mtd/hyperbus/Kconfig
+++ b/drivers/mtd/hyperbus/Kconfig
@@ -1,5 +1,6 @@
 menuconfig MTD_HYPERBUS
 	tristate "HyperBus support"
+	depends on HAS_IOMEM
 	select MTD_CFI
 	select MTD_MAP_BANK_WIDTH_2
 	select MTD_CFI_AMDSTD