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

Commit 237ee312 authored Nov 16, 2006 by Linus Torvalds

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Remove OP_MAX_COUNTER
  [ARM] Remove PM_LEGACY=y from selected ARM defconfigs
  [ARM] 3857/2: pnx4008: add devices' registration

parents d0cac32f aa8d1873

arch/arm/configs/ateb9200_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -217,7 +217,7 @@ CONFIG_BINFMT_ELF=y
	# Power management options		# Power management options
	#		#
	CONFIG_PM=y		CONFIG_PM=y
	CONFIG_PM_LEGACY=y		# CONFIG_PM_LEGACY is not set
	# CONFIG_PM_DEBUG is not set		# CONFIG_PM_DEBUG is not set
	# CONFIG_APM is not set		# CONFIG_APM is not set

arch/arm/configs/collie_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -219,7 +219,7 @@ CONFIG_BINFMT_ELF=y
	# Power management options		# Power management options
	#		#
	CONFIG_PM=y		CONFIG_PM=y
	CONFIG_PM_LEGACY=y		# CONFIG_PM_LEGACY is not set
	# CONFIG_PM_DEBUG is not set		# CONFIG_PM_DEBUG is not set
	CONFIG_APM=y		CONFIG_APM=y

arch/arm/configs/ixp4xx_defconfig

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -206,10 +206,8 @@ CONFIG_BINFMT_ELF=y
	#		#
	# Power management options		# Power management options
	#		#
	CONFIG_PM=y		# CONFIG_PM is not set
	CONFIG_PM_LEGACY=y		# CONFIG_APM is not set
	# CONFIG_PM_DEBUG is not set
	CONFIG_APM=y

	#		#
	# Networking		# Networking

arch/arm/configs/omap_h2_1610_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,7 @@ CONFIG_BINFMT_AOUT=y
	# Power management options		# Power management options
	#		#
	CONFIG_PM=y		CONFIG_PM=y
	CONFIG_PM_LEGACY=y		# CONFIG_PM_LEGACY is not set
	# CONFIG_PM_DEBUG is not set		# CONFIG_PM_DEBUG is not set
	# CONFIG_APM is not set		# CONFIG_APM is not set

arch/arm/configs/s3c2410_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -258,7 +258,7 @@ CONFIG_BINFMT_AOUT=y
	# Power management options		# Power management options
	#		#
	CONFIG_PM=y		CONFIG_PM=y
	CONFIG_PM_LEGACY=y		# CONFIG_PM_LEGACY is not set
	# CONFIG_PM_DEBUG is not set		# CONFIG_PM_DEBUG is not set
	# CONFIG_PM_SYSFS_DEPRECATED is not set		# CONFIG_PM_SYSFS_DEPRECATED is not set
	CONFIG_APM=y		CONFIG_APM=y