projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
blackfin
/
configs
/
BF526-EZBRD_defconfig
diff --git
a/arch/blackfin/configs/BF526-EZBRD_defconfig
b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 1759fad540178705f0ff77940655d47569f18b93..e66ba31ef84de15520ded3e787fd1b7b91af4425 100644
(file)
--- a/
arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/
arch/blackfin/configs/BF526-EZBRD_defconfig
@@
-53,7
+53,6
@@
CONFIG_IP_PNP=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
@@
-63,6
+62,7
@@
CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=m
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=m
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_RAM=y
CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set