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

This project is archived. Its data is read-only.

Commit a8a44921 authored Mar 30, 2011 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: bitops: fix include order after little endian inclusion
  Blackfin: defconfigs: update after misc devices defaulted to N
  Blackfin: use more standard pr_fmt in the module loader

parents 85eb1513 92a19d66

arch/blackfin/configs/BF527-AD7160-EVAL_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,6 @@ CONFIG_UNIX=y
	# CONFIG_WIRELESS is not set		# CONFIG_WIRELESS is not set
	CONFIG_BLK_DEV_LOOP=y		CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	# CONFIG_MISC_DEVICES is not set
	# CONFIG_INPUT_MOUSEDEV is not set		# CONFIG_INPUT_MOUSEDEV is not set
	CONFIG_INPUT_EVDEV=y		CONFIG_INPUT_EVDEV=y
	# CONFIG_INPUT_KEYBOARD is not set		# CONFIG_INPUT_KEYBOARD is not set

arch/blackfin/configs/BF538-EZKIT_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,6 @@ CONFIG_MTD_ROM=m
	CONFIG_MTD_PHYSMAP=m		CONFIG_MTD_PHYSMAP=m
	CONFIG_MTD_NAND=m		CONFIG_MTD_NAND=m
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	# CONFIG_MISC_DEVICES is not set
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_PHYLIB=y		CONFIG_PHYLIB=y
	CONFIG_SMSC_PHY=y		CONFIG_SMSC_PHY=y

arch/blackfin/configs/BF561-ACVILON_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,6 @@ CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_COUNT=2		CONFIG_BLK_DEV_RAM_COUNT=2
	CONFIG_BLK_DEV_RAM_SIZE=16384		CONFIG_BLK_DEV_RAM_SIZE=16384
	# CONFIG_MISC_DEVICES is not set
	CONFIG_SCSI=y		CONFIG_SCSI=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/BlackStamp_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,7 @@ CONFIG_MTD_M25P80=y
	CONFIG_BLK_DEV_LOOP=y		CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_NBD=y		CONFIG_BLK_DEV_NBD=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
			CONFIG_MISC_DEVICES=y
	CONFIG_EEPROM_AT25=y		CONFIG_EEPROM_AT25=y
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_NET_ETHERNET=y

arch/blackfin/configs/CM-BF527_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,6 @@ CONFIG_MTD_ROM=m
	CONFIG_MTD_COMPLEX_MAPPINGS=y		CONFIG_MTD_COMPLEX_MAPPINGS=y
	CONFIG_MTD_GPIO_ADDR=y		CONFIG_MTD_GPIO_ADDR=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	# CONFIG_MISC_DEVICES is not set
	CONFIG_SCSI=y		CONFIG_SCSI=y
	CONFIG_BLK_DEV_SD=y		CONFIG_BLK_DEV_SD=y
	# CONFIG_SCSI_LOWLEVEL is not set		# CONFIG_SCSI_LOWLEVEL is not set