aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-12 06:59:05 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-12 07:06:43 -0500
commitbd282422fe9566a89bc34af325efb6d2701903be (patch)
treeca9d7fd97872d3f0053ada5a580b01f535a00101 /arch/x86
parent556831063bcf8fd818e92227c40e3eaabe759bab (diff)
x86, defconfig: turn off CONFIG_SCSI_ISCSI_ATTRS=y
It was enabled by mistake - iscsi is not included in a typical default PC, and no other architecture has it built-in (=y) either. Turn it off. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/configs/i386_defconfig8
-rw-r--r--arch/x86/configs/x86_64_defconfig8
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 0562a36f74d9..8f40a80ccb55 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc4 3# Linux kernel version: 2.6.29-rc4
4# Thu Feb 12 12:42:50 2009 4# Thu Feb 12 12:57:57 2009
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -835,7 +835,7 @@ CONFIG_SCSI_WAIT_SCAN=m
835# 835#
836CONFIG_SCSI_SPI_ATTRS=y 836CONFIG_SCSI_SPI_ATTRS=y
837# CONFIG_SCSI_FC_ATTRS is not set 837# CONFIG_SCSI_FC_ATTRS is not set
838CONFIG_SCSI_ISCSI_ATTRS=y 838# CONFIG_SCSI_ISCSI_ATTRS is not set
839# CONFIG_SCSI_SAS_ATTRS is not set 839# CONFIG_SCSI_SAS_ATTRS is not set
840# CONFIG_SCSI_SAS_LIBSAS is not set 840# CONFIG_SCSI_SAS_LIBSAS is not set
841# CONFIG_SCSI_SRP_ATTRS is not set 841# CONFIG_SCSI_SRP_ATTRS is not set
@@ -2064,8 +2064,7 @@ CONFIG_EFI_VARS=y
2064# CONFIG_DELL_RBU is not set 2064# CONFIG_DELL_RBU is not set
2065# CONFIG_DCDBAS is not set 2065# CONFIG_DCDBAS is not set
2066CONFIG_DMIID=y 2066CONFIG_DMIID=y
2067CONFIG_ISCSI_IBFT_FIND=y 2067# CONFIG_ISCSI_IBFT_FIND is not set
2068CONFIG_ISCSI_IBFT=y
2069 2068
2070# 2069#
2071# File systems 2070# File systems
@@ -2243,6 +2242,7 @@ CONFIG_NLS_UTF8=y
2243CONFIG_TRACE_IRQFLAGS_SUPPORT=y 2242CONFIG_TRACE_IRQFLAGS_SUPPORT=y
2244CONFIG_PRINTK_TIME=y 2243CONFIG_PRINTK_TIME=y
2245# CONFIG_ENABLE_WARN_DEPRECATED is not set 2244# CONFIG_ENABLE_WARN_DEPRECATED is not set
2245CONFIG_ENABLE_MUST_CHECK=y
2246CONFIG_FRAME_WARN=2048 2246CONFIG_FRAME_WARN=2048
2247CONFIG_MAGIC_SYSRQ=y 2247CONFIG_MAGIC_SYSRQ=y
2248# CONFIG_UNUSED_SYMBOLS is not set 2248# CONFIG_UNUSED_SYMBOLS is not set
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 06633483b292..10728fd91c63 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc4 3# Linux kernel version: 2.6.29-rc4
4# Thu Feb 12 12:48:13 2009 4# Thu Feb 12 12:57:29 2009
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7# CONFIG_X86_32 is not set 7# CONFIG_X86_32 is not set
@@ -837,7 +837,7 @@ CONFIG_SCSI_WAIT_SCAN=m
837# 837#
838CONFIG_SCSI_SPI_ATTRS=y 838CONFIG_SCSI_SPI_ATTRS=y
839# CONFIG_SCSI_FC_ATTRS is not set 839# CONFIG_SCSI_FC_ATTRS is not set
840CONFIG_SCSI_ISCSI_ATTRS=y 840# CONFIG_SCSI_ISCSI_ATTRS is not set
841# CONFIG_SCSI_SAS_ATTRS is not set 841# CONFIG_SCSI_SAS_ATTRS is not set
842# CONFIG_SCSI_SAS_LIBSAS is not set 842# CONFIG_SCSI_SAS_LIBSAS is not set
843# CONFIG_SCSI_SRP_ATTRS is not set 843# CONFIG_SCSI_SRP_ATTRS is not set
@@ -2044,8 +2044,7 @@ CONFIG_EFI_VARS=y
2044# CONFIG_DELL_RBU is not set 2044# CONFIG_DELL_RBU is not set
2045# CONFIG_DCDBAS is not set 2045# CONFIG_DCDBAS is not set
2046CONFIG_DMIID=y 2046CONFIG_DMIID=y
2047CONFIG_ISCSI_IBFT_FIND=y 2047# CONFIG_ISCSI_IBFT_FIND is not set
2048CONFIG_ISCSI_IBFT=y
2049 2048
2050# 2049#
2051# File systems 2050# File systems
@@ -2224,6 +2223,7 @@ CONFIG_NLS_UTF8=y
2224CONFIG_TRACE_IRQFLAGS_SUPPORT=y 2223CONFIG_TRACE_IRQFLAGS_SUPPORT=y
2225CONFIG_PRINTK_TIME=y 2224CONFIG_PRINTK_TIME=y
2226# CONFIG_ENABLE_WARN_DEPRECATED is not set 2225# CONFIG_ENABLE_WARN_DEPRECATED is not set
2226CONFIG_ENABLE_MUST_CHECK=y
2227CONFIG_FRAME_WARN=2048 2227CONFIG_FRAME_WARN=2048
2228CONFIG_MAGIC_SYSRQ=y 2228CONFIG_MAGIC_SYSRQ=y
2229# CONFIG_UNUSED_SYMBOLS is not set 2229# CONFIG_UNUSED_SYMBOLS is not set