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

Commit 4fe8a0f4 authored Sep 08, 2005 by Linus Torvalds

Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 529980c8 344a0761

arch/ia64/Kconfig

+0 −6

Original line number	Diff line number	Diff line
		@@ -339,12 +339,6 @@ config IA64_PALINFO
		To use this option, you have to ensure that the "/proc file system
		support" (CONFIG_PROC_FS) is enabled, too.

		config ACPI_DEALLOCATE_IRQ
		bool
		depends on ACPI
		depends on IOSAPIC && EXPERIMENTAL
		default y

		source "drivers/firmware/Kconfig"

		source "fs/Kconfig.binfmt"

arch/ia64/configs/sn2_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ CONFIG_COMPAT=y
		CONFIG_IA64_MCA_RECOVERY=y
		CONFIG_PERFMON=y
		CONFIG_IA64_PALINFO=y
		CONFIG_ACPI_DEALLOCATE_IRQ=y

		#
		# Firmware Drivers

arch/ia64/configs/tiger_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
		CONFIG_IA64_MCA_RECOVERY=y
		CONFIG_PERFMON=y
		CONFIG_IA64_PALINFO=y
		CONFIG_ACPI_DEALLOCATE_IRQ=y

		#
		# Firmware Drivers

arch/ia64/configs/zx1_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
		CONFIG_IA64_MCA_RECOVERY=y
		CONFIG_PERFMON=y
		CONFIG_IA64_PALINFO=y
		CONFIG_ACPI_DEALLOCATE_IRQ=y

		#
		# Firmware Drivers

arch/ia64/defconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ CONFIG_COMPAT=y
		CONFIG_IA64_MCA_RECOVERY=y
		CONFIG_PERFMON=y
		CONFIG_IA64_PALINFO=y
		CONFIG_ACPI_DEALLOCATE_IRQ=y

		#
		# Firmware Drivers
		@@ -335,7 +334,7 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
		CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
		# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
		# CONFIG_SCSI_IPR is not set
		CONFIG_SCSI_QLOGIC_FC=y
		# CONFIG_SCSI_QLOGIC_FC is not set
		# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
		CONFIG_SCSI_QLOGIC_1280=y
		# CONFIG_SCSI_QLOGIC_1280_1040 is not set