Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88bbfb4a authored Jun 12, 2014 by Linus Torvalds

Merge tag 'blackfin-for-linus' of...

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

parents 71998d1b 51fdc6bf

arch/blackfin/configs/BF526-EZBRD_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,6 @@ CONFIG_IP_PNP=y
	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	# CONFIG_FW_LOADER is not set		# CONFIG_FW_LOADER is not set
	CONFIG_MTD=y		CONFIG_MTD=y
	CONFIG_MTD_CHAR=y
	CONFIG_MTD_BLOCK=y		CONFIG_MTD_BLOCK=y
	CONFIG_MTD_CFI=y		CONFIG_MTD_CFI=y
	CONFIG_MTD_CFI_INTELEXT=y		CONFIG_MTD_CFI_INTELEXT=y
	@@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
	CONFIG_MTD_PHYSMAP=y		CONFIG_MTD_PHYSMAP=y
	CONFIG_MTD_M25P80=y		CONFIG_MTD_M25P80=y
	CONFIG_MTD_NAND=m		CONFIG_MTD_NAND=m
			CONFIG_MTD_SPI_NOR=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_SCSI=y		CONFIG_SCSI=y
	# CONFIG_SCSI_PROC_FS is not set		# CONFIG_SCSI_PROC_FS is not set

arch/blackfin/configs/BF527-EZKIT-V2_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,6 @@ CONFIG_BFIN_SIR0=y
	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	# CONFIG_FW_LOADER is not set		# CONFIG_FW_LOADER is not set
	CONFIG_MTD=y		CONFIG_MTD=y
	CONFIG_MTD_CHAR=m
	CONFIG_MTD_BLOCK=y		CONFIG_MTD_BLOCK=y
	CONFIG_MTD_JEDECPROBE=m		CONFIG_MTD_JEDECPROBE=m
	CONFIG_MTD_RAM=y		CONFIG_MTD_RAM=y
	@@ -66,6 +65,7 @@ CONFIG_MTD_ROM=m
	CONFIG_MTD_COMPLEX_MAPPINGS=y		CONFIG_MTD_COMPLEX_MAPPINGS=y
	CONFIG_MTD_M25P80=y		CONFIG_MTD_M25P80=y
	CONFIG_MTD_NAND=m		CONFIG_MTD_NAND=m
			CONFIG_MTD_SPI_NOR=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_SCSI=y		CONFIG_SCSI=y
	# CONFIG_SCSI_PROC_FS is not set		# CONFIG_SCSI_PROC_FS is not set

arch/blackfin/configs/BF527-EZKIT_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y
	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	# CONFIG_FW_LOADER is not set		# CONFIG_FW_LOADER is not set
	CONFIG_MTD=y		CONFIG_MTD=y
	CONFIG_MTD_CHAR=m
	CONFIG_MTD_BLOCK=y		CONFIG_MTD_BLOCK=y
	CONFIG_MTD_JEDECPROBE=m		CONFIG_MTD_JEDECPROBE=m
	CONFIG_MTD_RAM=y		CONFIG_MTD_RAM=y
	@@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m
	CONFIG_MTD_COMPLEX_MAPPINGS=y		CONFIG_MTD_COMPLEX_MAPPINGS=y
	CONFIG_MTD_M25P80=y		CONFIG_MTD_M25P80=y
	CONFIG_MTD_NAND=m		CONFIG_MTD_NAND=m
			CONFIG_MTD_SPI_NOR=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_SCSI=y		CONFIG_SCSI=y
	# CONFIG_SCSI_PROC_FS is not set		# CONFIG_SCSI_PROC_FS is not set

arch/blackfin/configs/BF548-EZKIT_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	CONFIG_FW_LOADER=m		CONFIG_FW_LOADER=m
	CONFIG_MTD=y		CONFIG_MTD=y
	CONFIG_MTD_CMDLINE_PARTS=y		CONFIG_MTD_CMDLINE_PARTS=y
	CONFIG_MTD_CHAR=y
	CONFIG_MTD_BLOCK=y		CONFIG_MTD_BLOCK=y
	CONFIG_MTD_CFI=y		CONFIG_MTD_CFI=y
	CONFIG_MTD_CFI_INTELEXT=y		CONFIG_MTD_CFI_INTELEXT=y
	@@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y
	CONFIG_MTD_NAND=y		CONFIG_MTD_NAND=y
	CONFIG_MTD_NAND_BF5XX=y		CONFIG_MTD_NAND_BF5XX=y
	# CONFIG_MTD_NAND_BF5XX_HWECC is not set		# CONFIG_MTD_NAND_BF5XX_HWECC is not set
			CONFIG_MTD_SPI_NOR=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	# CONFIG_SCSI_PROC_FS is not set		# CONFIG_SCSI_PROC_FS is not set
	CONFIG_BLK_DEV_SD=y		CONFIG_BLK_DEV_SD=y

arch/blackfin/configs/BF609-EZKIT_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	CONFIG_FW_LOADER=m		CONFIG_FW_LOADER=m
	CONFIG_MTD=y		CONFIG_MTD=y
	CONFIG_MTD_CMDLINE_PARTS=y		CONFIG_MTD_CMDLINE_PARTS=y
	CONFIG_MTD_CHAR=y
	CONFIG_MTD_BLOCK=y		CONFIG_MTD_BLOCK=y
	CONFIG_MTD_CFI=y		CONFIG_MTD_CFI=y
	CONFIG_MTD_CFI_INTELEXT=y		CONFIG_MTD_CFI_INTELEXT=y
	@@ -65,6 +64,7 @@ CONFIG_MTD_CFI_STAA=y
	CONFIG_MTD_COMPLEX_MAPPINGS=y		CONFIG_MTD_COMPLEX_MAPPINGS=y
	CONFIG_MTD_PHYSMAP=y		CONFIG_MTD_PHYSMAP=y
	CONFIG_MTD_M25P80=y		CONFIG_MTD_M25P80=y
			CONFIG_MTD_SPI_NOR=y
	CONFIG_MTD_UBI=m		CONFIG_MTD_UBI=m
	CONFIG_SCSI=y		CONFIG_SCSI=y
	CONFIG_BLK_DEV_SD=y		CONFIG_BLK_DEV_SD=y