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

Commit 472e3741 authored Apr 05, 2014 by Linus Torvalds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68k fixes from Greg Ungerer:
 "Just a couple of fixes.  Clean up compile warnings by using correct
  types in function args, and clean out the removed CONFIG_MTD_PARTITIONS"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix arg types for outs* functions
  m68k : Kill CONFIG_MTD_PARTITIONS

parents 463b21fb 4dc5aa21

arch/m68k/configs/m5208evb_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ CONFIG_INET=y
		# CONFIG_IPV6 is not set
		# CONFIG_FW_LOADER is not set
		CONFIG_MTD=y
		CONFIG_MTD_PARTITIONS=y
		CONFIG_MTD_CHAR=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_RAM=y

arch/m68k/configs/m5249evb_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ CONFIG_INET=y
		# CONFIG_IPV6 is not set
		# CONFIG_FW_LOADER is not set
		CONFIG_MTD=y
		CONFIG_MTD_PARTITIONS=y
		CONFIG_MTD_CHAR=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_RAM=y

arch/m68k/configs/m5272c3_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ CONFIG_INET=y
		# CONFIG_IPV6 is not set
		# CONFIG_FW_LOADER is not set
		CONFIG_MTD=y
		CONFIG_MTD_PARTITIONS=y
		CONFIG_MTD_CHAR=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_RAM=y

arch/m68k/configs/m5275evb_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ CONFIG_INET=y
		# CONFIG_IPV6 is not set
		# CONFIG_FW_LOADER is not set
		CONFIG_MTD=y
		CONFIG_MTD_PARTITIONS=y
		CONFIG_MTD_CHAR=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_RAM=y

arch/m68k/configs/m5307c3_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ CONFIG_INET=y
		# CONFIG_IPV6 is not set
		# CONFIG_FW_LOADER is not set
		CONFIG_MTD=y
		CONFIG_MTD_PARTITIONS=y
		CONFIG_MTD_CHAR=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_RAM=y