diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 23:08:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 23:08:47 -0400 |
commit | 88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch) | |
tree | 5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /arch/blackfin/configs/BF527-EZKIT_defconfig | |
parent | 71998d1be4ae70e7d320cdd21595c1a02a29c61e (diff) | |
parent | 51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (diff) |
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Revert "blackfin: dma: current count mmr is read only"
bf533: fix build error: add linux/gpio.h
Diffstat (limited to 'arch/blackfin/configs/BF527-EZKIT_defconfig')
-rw-r--r-- | arch/blackfin/configs/BF527-EZKIT_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 2e73a5d33da8..99c131ba7d90 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
@@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y | |||
57 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 57 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
58 | # CONFIG_FW_LOADER is not set | 58 | # CONFIG_FW_LOADER is not set |
59 | CONFIG_MTD=y | 59 | CONFIG_MTD=y |
60 | CONFIG_MTD_CHAR=m | ||
61 | CONFIG_MTD_BLOCK=y | 60 | CONFIG_MTD_BLOCK=y |
62 | CONFIG_MTD_JEDECPROBE=m | 61 | CONFIG_MTD_JEDECPROBE=m |
63 | CONFIG_MTD_RAM=y | 62 | CONFIG_MTD_RAM=y |
@@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m | |||
65 | CONFIG_MTD_COMPLEX_MAPPINGS=y | 64 | CONFIG_MTD_COMPLEX_MAPPINGS=y |
66 | CONFIG_MTD_M25P80=y | 65 | CONFIG_MTD_M25P80=y |
67 | CONFIG_MTD_NAND=m | 66 | CONFIG_MTD_NAND=m |
67 | CONFIG_MTD_SPI_NOR=y | ||
68 | CONFIG_BLK_DEV_RAM=y | 68 | CONFIG_BLK_DEV_RAM=y |
69 | CONFIG_SCSI=y | 69 | CONFIG_SCSI=y |
70 | # CONFIG_SCSI_PROC_FS is not set | 70 | # CONFIG_SCSI_PROC_FS is not set |