Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[IA64] refresh arch/ia64/configs/* using "make savedefconfig"

Prompted by a change to drivers/scsi/Kconfig which used to do a
"select NET" but now does a "depends on NET". This meant that some
configurations ended up without CONFIG_NET=y

Signed-off-by Tony Luck <tony.luck@intel.com>
Tony Luck 11 years ago
parent
f3670394c2
commit
e8ee39e227
6 changed files with 29 additions and 83 deletions
Unified View Show Diff Stats
  1. 3 10
      arch/ia64/configs/bigsur_defconfig
  2. 7 22
      arch/ia64/configs/generic_defconfig
  3. 6 17
      arch/ia64/configs/gensparse_defconfig
  4. 2 6
      arch/ia64/configs/sim_defconfig
  5. 7 18
      arch/ia64/configs/tiger_defconfig
  6. 4 10
      arch/ia64/configs/zx1_defconfig

+ 3 - 10
arch/ia64/configs/bigsur_defconfig
View File 

@@ -1,4 +1,3 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_LOG_BUF_SHIFT=16
 
 CONFIG_LOG_BUF_SHIFT=16
 
@@ -6,6 +5,8 @@ CONFIG_PROFILING=y
 
 CONFIG_OPROFILE=y
 
 CONFIG_OPROFILE=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_UNLOAD=y
 
+CONFIG_PARTITION_ADVANCED=y
 
+CONFIG_SGI_PARTITION=y
 
 CONFIG_IA64_DIG=y
 
 CONFIG_IA64_DIG=y
 
 CONFIG_SMP=y
 
 CONFIG_SMP=y
 
 CONFIG_NR_CPUS=2
 
 CONFIG_NR_CPUS=2
 
@@ -51,9 +52,6 @@ CONFIG_DM_MIRROR=m
 
 CONFIG_DM_ZERO=m
 
 CONFIG_DM_ZERO=m
 
 CONFIG_NETDEVICES=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_DUMMY=y
 
 CONFIG_DUMMY=y
 
-CONFIG_NET_ETHERNET=y
 
-CONFIG_MII=y
 
-CONFIG_NET_PCI=y
 
 CONFIG_INPUT_EVDEV=y
 
 CONFIG_INPUT_EVDEV=y
 
 CONFIG_SERIAL_8250=y
 
 CONFIG_SERIAL_8250=y
 
 CONFIG_SERIAL_8250_CONSOLE=y
 
 CONFIG_SERIAL_8250_CONSOLE=y
 
@@ -85,7 +83,6 @@ CONFIG_EXT3_FS=y
 
 CONFIG_XFS_FS=y
 
 CONFIG_XFS_FS=y
 
 CONFIG_XFS_QUOTA=y
 
 CONFIG_XFS_QUOTA=y
 
 CONFIG_XFS_POSIX_ACL=y
 
 CONFIG_XFS_POSIX_ACL=y
 
-CONFIG_AUTOFS_FS=m
 
 CONFIG_AUTOFS4_FS=m
 
 CONFIG_AUTOFS4_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_JOLIET=y
 
 CONFIG_JOLIET=y
 
@@ -95,17 +92,13 @@ CONFIG_PROC_KCORE=y
 
 CONFIG_TMPFS=y
 
 CONFIG_TMPFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=m
 
 CONFIG_NFS_FS=m
 
-CONFIG_NFS_V3=y
 
-CONFIG_NFS_V4=y
 
+CONFIG_NFS_V4=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD_V4=y
 
 CONFIG_NFSD_V4=y
 
 CONFIG_CIFS=m
 
 CONFIG_CIFS=m
 
 CONFIG_CIFS_STATS=y
 
 CONFIG_CIFS_STATS=y
 
 CONFIG_CIFS_XATTR=y
 
 CONFIG_CIFS_XATTR=y
 
 CONFIG_CIFS_POSIX=y
 
 CONFIG_CIFS_POSIX=y
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_SGI_PARTITION=y
 
-CONFIG_EFI_PARTITION=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_ISO8859_1=y
 
 CONFIG_NLS_ISO8859_1=y
 
 CONFIG_NLS_UTF8=m
 
 CONFIG_NLS_UTF8=m

+ 7 - 22
arch/ia64/configs/generic_defconfig
View File 

@@ -1,4 +1,3 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG=y
 
@@ -6,13 +5,13 @@ CONFIG_IKCONFIG_PROC=y
 
 CONFIG_LOG_BUF_SHIFT=20
 
 CONFIG_LOG_BUF_SHIFT=20
 
 CONFIG_CGROUPS=y
 
 CONFIG_CGROUPS=y
 
 CONFIG_CPUSETS=y
 
 CONFIG_CPUSETS=y
 
-CONFIG_SYSFS_DEPRECATED_V2=y
 
 CONFIG_BLK_DEV_INITRD=y
 
 CONFIG_BLK_DEV_INITRD=y
 
 CONFIG_KALLSYMS_ALL=y
 
 CONFIG_KALLSYMS_ALL=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODVERSIONS=y
 
-# CONFIG_BLK_DEV_BSG is not set
 
+CONFIG_PARTITION_ADVANCED=y
 
+CONFIG_SGI_PARTITION=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
 CONFIG_IA64_CYCLONE=y
 
 CONFIG_IA64_CYCLONE=y
 
@@ -29,14 +28,13 @@ CONFIG_ACPI_BUTTON=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_DOCK=y
 
 CONFIG_ACPI_DOCK=y
 
 CONFIG_ACPI_PROCESSOR=m
 
 CONFIG_ACPI_PROCESSOR=m
 
-CONFIG_ACPI_CONTAINER=y
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI_ACPI=y
 
 CONFIG_HOTPLUG_PCI_ACPI=y
 
+CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX=y
 
 CONFIG_INET=y
 
 CONFIG_INET=y
 
 CONFIG_IP_MULTICAST=y
 
 CONFIG_IP_MULTICAST=y
 
-CONFIG_ARPD=y
 
 CONFIG_SYN_COOKIES=y
 
 CONFIG_SYN_COOKIES=y
 
 # CONFIG_IPV6 is not set
 
 # CONFIG_IPV6 is not set
 
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 
@@ -82,16 +80,13 @@ CONFIG_FUSION_FC=m
 
 CONFIG_FUSION_SAS=y
 
 CONFIG_FUSION_SAS=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_DUMMY=m
 
 CONFIG_DUMMY=m
 
-CONFIG_NET_ETHERNET=y
 
+CONFIG_NETCONSOLE=y
 
+CONFIG_TIGON3=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_TULIP=m
 
 CONFIG_TULIP=m
 
-CONFIG_NET_PCI=y
 
-CONFIG_NET_VENDOR_INTEL=y
 
 CONFIG_E100=m
 
 CONFIG_E100=m
 
 CONFIG_E1000=y
 
 CONFIG_E1000=y
 
 CONFIG_IGB=y
 
 CONFIG_IGB=y
 
-CONFIG_TIGON3=y
 
-CONFIG_NETCONSOLE=y
 
 # CONFIG_SERIO_SERPORT is not set
 
 # CONFIG_SERIO_SERPORT is not set
 
 CONFIG_GAMEPORT=m
 
 CONFIG_GAMEPORT=m
 
 CONFIG_SERIAL_NONSTANDARD=y
 
 CONFIG_SERIAL_NONSTANDARD=y
 
@@ -151,6 +146,7 @@ CONFIG_USB_STORAGE=m
 
 CONFIG_INFINIBAND=m
 
 CONFIG_INFINIBAND=m
 
 CONFIG_INFINIBAND_MTHCA=m
 
 CONFIG_INFINIBAND_MTHCA=m
 
 CONFIG_INFINIBAND_IPOIB=m
 
 CONFIG_INFINIBAND_IPOIB=m
 
+CONFIG_INTEL_IOMMU=y
 
 CONFIG_MSPEC=m
 
 CONFIG_MSPEC=m
 
 CONFIG_EXT2_FS=y
 
 CONFIG_EXT2_FS=y
 
 CONFIG_EXT2_FS_XATTR=y
 
 CONFIG_EXT2_FS_XATTR=y
 
@@ -164,7 +160,6 @@ CONFIG_REISERFS_FS_XATTR=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_XFS_FS=y
 
 CONFIG_XFS_FS=y
 
-CONFIG_AUTOFS_FS=m
 
 CONFIG_AUTOFS4_FS=m
 
 CONFIG_AUTOFS4_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_JOLIET=y
 
 CONFIG_JOLIET=y
 
@@ -175,16 +170,10 @@ CONFIG_PROC_KCORE=y
 
 CONFIG_TMPFS=y
 
 CONFIG_TMPFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=m
 
 CONFIG_NFS_FS=m
 
-CONFIG_NFS_V3=y
 
-CONFIG_NFS_V4=y
 
+CONFIG_NFS_V4=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD_V4=y
 
 CONFIG_NFSD_V4=y
 
-CONFIG_SMB_FS=m
 
-CONFIG_SMB_NLS_DEFAULT=y
 
 CONFIG_CIFS=m
 
 CONFIG_CIFS=m
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_SGI_PARTITION=y
 
-CONFIG_EFI_PARTITION=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_775=m
 
 CONFIG_NLS_CODEPAGE_775=m
 
@@ -225,11 +214,7 @@ CONFIG_NLS_UTF8=m
 
 CONFIG_MAGIC_SYSRQ=y
 
 CONFIG_MAGIC_SYSRQ=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_MUTEXES=y
 
 CONFIG_DEBUG_MUTEXES=y
 
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 
-CONFIG_CRYPTO_ECB=m
 
 CONFIG_CRYPTO_PCBC=m
 
 CONFIG_CRYPTO_PCBC=m
 
 CONFIG_CRYPTO_MD5=y
 
 CONFIG_CRYPTO_MD5=y
 
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 
 CONFIG_CRC_T10DIF=y
 
 CONFIG_CRC_T10DIF=y
 
-CONFIG_INTEL_IOMMU=y

+ 6 - 17
arch/ia64/configs/gensparse_defconfig
View File 

@@ -1,4 +1,3 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG=y
 
@@ -9,6 +8,8 @@ CONFIG_KALLSYMS_ALL=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODVERSIONS=y
 
+CONFIG_PARTITION_ADVANCED=y
 
+CONFIG_SGI_PARTITION=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_IA64_CYCLONE=y
 
 CONFIG_IA64_CYCLONE=y
 
 CONFIG_SMP=y
 
 CONFIG_SMP=y
 
@@ -24,14 +25,12 @@ CONFIG_BINFMT_MISC=m
 
 CONFIG_ACPI_BUTTON=m
 
 CONFIG_ACPI_BUTTON=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_PROCESSOR=m
 
 CONFIG_ACPI_PROCESSOR=m
 
-CONFIG_ACPI_CONTAINER=m
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI=y
 
-CONFIG_HOTPLUG_PCI_ACPI=m
 
+CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX=y
 
 CONFIG_INET=y
 
 CONFIG_INET=y
 
 CONFIG_IP_MULTICAST=y
 
 CONFIG_IP_MULTICAST=y
 
-CONFIG_ARPD=y
 
 CONFIG_SYN_COOKIES=y
 
 CONFIG_SYN_COOKIES=y
 
 # CONFIG_IPV6 is not set
 
 # CONFIG_IPV6 is not set
 
 CONFIG_BLK_DEV_LOOP=m
 
 CONFIG_BLK_DEV_LOOP=m
 
@@ -71,15 +70,12 @@ CONFIG_FUSION_SPI=y
 
 CONFIG_FUSION_FC=m
 
 CONFIG_FUSION_FC=m
 
 CONFIG_NETDEVICES=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_DUMMY=m
 
 CONFIG_DUMMY=m
 
-CONFIG_NET_ETHERNET=y
 
+CONFIG_NETCONSOLE=y
 
+CONFIG_TIGON3=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_TULIP=m
 
 CONFIG_TULIP=m
 
-CONFIG_NET_PCI=y
 
-CONFIG_NET_VENDOR_INTEL=y
 
 CONFIG_E100=m
 
 CONFIG_E100=m
 
 CONFIG_E1000=y
 
 CONFIG_E1000=y
 
-CONFIG_TIGON3=y
 
-CONFIG_NETCONSOLE=y
 
 # CONFIG_SERIO_SERPORT is not set
 
 # CONFIG_SERIO_SERPORT is not set
 
 CONFIG_GAMEPORT=m
 
 CONFIG_GAMEPORT=m
 
 CONFIG_SERIAL_NONSTANDARD=y
 
 CONFIG_SERIAL_NONSTANDARD=y
 
@@ -146,7 +142,6 @@ CONFIG_REISERFS_FS_XATTR=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_XFS_FS=y
 
 CONFIG_XFS_FS=y
 
-CONFIG_AUTOFS_FS=y
 
 CONFIG_AUTOFS4_FS=y
 
 CONFIG_AUTOFS4_FS=y
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_JOLIET=y
 
 CONFIG_JOLIET=y
 
@@ -157,16 +152,10 @@ CONFIG_PROC_KCORE=y
 
 CONFIG_TMPFS=y
 
 CONFIG_TMPFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=m
 
 CONFIG_NFS_FS=m
 
-CONFIG_NFS_V3=y
 
-CONFIG_NFS_V4=y
 
+CONFIG_NFS_V4=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD_V4=y
 
 CONFIG_NFSD_V4=y
 
-CONFIG_SMB_FS=m
 
-CONFIG_SMB_NLS_DEFAULT=y
 
 CONFIG_CIFS=m
 
 CONFIG_CIFS=m
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_SGI_PARTITION=y
 
-CONFIG_EFI_PARTITION=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_775=m
 
 CONFIG_NLS_CODEPAGE_775=m

+ 2 - 6
arch/ia64/configs/sim_defconfig
View File 

@@ -1,13 +1,12 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG_PROC=y
 
 CONFIG_IKCONFIG_PROC=y
 
 CONFIG_LOG_BUF_SHIFT=16
 
 CONFIG_LOG_BUF_SHIFT=16
 
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 CONFIG_MODULES=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODVERSIONS=y
 
+CONFIG_PARTITION_ADVANCED=y
 
 CONFIG_IA64_HP_SIM=y
 
 CONFIG_IA64_HP_SIM=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
@@ -27,7 +26,6 @@ CONFIG_BLK_DEV_LOOP=y
 
 CONFIG_BLK_DEV_RAM=y
 
 CONFIG_BLK_DEV_RAM=y
 
 CONFIG_SCSI=y
 
 CONFIG_SCSI=y
 
 CONFIG_BLK_DEV_SD=y
 
 CONFIG_BLK_DEV_SD=y
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_SPI_ATTRS=y
 
 CONFIG_SCSI_SPI_ATTRS=y
 
@@ -49,8 +47,6 @@ CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=y
 
 CONFIG_NFS_FS=y
 
 CONFIG_NFSD=y
 
 CONFIG_NFSD=y
 
 CONFIG_NFSD_V3=y
 
 CONFIG_NFSD_V3=y
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_EFI_PARTITION=y
 
+CONFIG_DEBUG_INFO=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_MUTEXES=y
 
 CONFIG_DEBUG_MUTEXES=y
 
-CONFIG_DEBUG_INFO=y

+ 7 - 18
arch/ia64/configs/tiger_defconfig
View File 

@@ -1,4 +1,3 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_POSIX_MQUEUE=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG=y
 
@@ -11,6 +10,8 @@ CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODULE_SRCVERSION_ALL=y
 
 CONFIG_MODULE_SRCVERSION_ALL=y
 
 # CONFIG_BLK_DEV_BSG is not set
 
 # CONFIG_BLK_DEV_BSG is not set
 
+CONFIG_PARTITION_ADVANCED=y
 
+CONFIG_SGI_PARTITION=y
 
 CONFIG_IA64_DIG=y
 
 CONFIG_IA64_DIG=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
 CONFIG_IA64_PAGE_SIZE_64KB=y
 
@@ -29,14 +30,12 @@ CONFIG_BINFMT_MISC=m
 
 CONFIG_ACPI_BUTTON=m
 
 CONFIG_ACPI_BUTTON=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_FAN=m
 
 CONFIG_ACPI_PROCESSOR=m
 
 CONFIG_ACPI_PROCESSOR=m
 
-CONFIG_ACPI_CONTAINER=m
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI=y
 
-CONFIG_HOTPLUG_PCI_ACPI=m
 
+CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX=y
 
 CONFIG_INET=y
 
 CONFIG_INET=y
 
 CONFIG_IP_MULTICAST=y
 
 CONFIG_IP_MULTICAST=y
 
-CONFIG_ARPD=y
 
 CONFIG_SYN_COOKIES=y
 
 CONFIG_SYN_COOKIES=y
 
 # CONFIG_IPV6 is not set
 
 # CONFIG_IPV6 is not set
 
 CONFIG_BLK_DEV_LOOP=m
 
 CONFIG_BLK_DEV_LOOP=m
 
@@ -53,6 +52,7 @@ CONFIG_BLK_DEV_SD=y
 
 CONFIG_CHR_DEV_ST=m
 
 CONFIG_CHR_DEV_ST=m
 
 CONFIG_BLK_DEV_SR=m
 
 CONFIG_BLK_DEV_SR=m
 
 CONFIG_CHR_DEV_SG=m
 
 CONFIG_CHR_DEV_SG=m
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SYM53C8XX_2=y
 
 CONFIG_SCSI_SYM53C8XX_2=y
 
 CONFIG_SCSI_QLOGIC_1280=y
 
 CONFIG_SCSI_QLOGIC_1280=y
 
 CONFIG_MD=y
 
 CONFIG_MD=y
 
@@ -72,15 +72,12 @@ CONFIG_FUSION_FC=y
 
 CONFIG_FUSION_CTL=y
 
 CONFIG_FUSION_CTL=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_DUMMY=m
 
 CONFIG_DUMMY=m
 
-CONFIG_NET_ETHERNET=y
 
+CONFIG_NETCONSOLE=y
 
+CONFIG_TIGON3=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_TULIP=m
 
 CONFIG_TULIP=m
 
-CONFIG_NET_PCI=y
 
-CONFIG_NET_VENDOR_INTEL=y
 
 CONFIG_E100=m
 
 CONFIG_E100=m
 
 CONFIG_E1000=y
 
 CONFIG_E1000=y
 
-CONFIG_TIGON3=y
 
-CONFIG_NETCONSOLE=y
 
 # CONFIG_SERIO_SERPORT is not set
 
 # CONFIG_SERIO_SERPORT is not set
 
 CONFIG_GAMEPORT=m
 
 CONFIG_GAMEPORT=m
 
 CONFIG_SERIAL_NONSTANDARD=y
 
 CONFIG_SERIAL_NONSTANDARD=y
 
@@ -118,7 +115,6 @@ CONFIG_REISERFS_FS_XATTR=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_POSIX_ACL=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_REISERFS_FS_SECURITY=y
 
 CONFIG_XFS_FS=y
 
 CONFIG_XFS_FS=y
 
-CONFIG_AUTOFS_FS=y
 
 CONFIG_AUTOFS4_FS=y
 
 CONFIG_AUTOFS4_FS=y
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_ISO9660_FS=m
 
 CONFIG_JOLIET=y
 
 CONFIG_JOLIET=y
 
@@ -129,16 +125,10 @@ CONFIG_PROC_KCORE=y
 
 CONFIG_TMPFS=y
 
 CONFIG_TMPFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=m
 
 CONFIG_NFS_FS=m
 
-CONFIG_NFS_V3=y
 
-CONFIG_NFS_V4=y
 
+CONFIG_NFS_V4=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD=m
 
 CONFIG_NFSD_V4=y
 
 CONFIG_NFSD_V4=y
 
-CONFIG_SMB_FS=m
 
-CONFIG_SMB_NLS_DEFAULT=y
 
 CONFIG_CIFS=m
 
 CONFIG_CIFS=m
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_SGI_PARTITION=y
 
-CONFIG_EFI_PARTITION=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_737=m
 
 CONFIG_NLS_CODEPAGE_775=m
 
 CONFIG_NLS_CODEPAGE_775=m
 
@@ -180,6 +170,5 @@ CONFIG_MAGIC_SYSRQ=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_KERNEL=y
 
 CONFIG_DEBUG_MUTEXES=y
 
 CONFIG_DEBUG_MUTEXES=y
 
 CONFIG_IA64_GRANULE_16MB=y
 
 CONFIG_IA64_GRANULE_16MB=y
 
-CONFIG_CRYPTO_ECB=m
 
 CONFIG_CRYPTO_PCBC=m
 
 CONFIG_CRYPTO_PCBC=m
 
 CONFIG_CRYPTO_MD5=y
 
 CONFIG_CRYPTO_MD5=y

+ 4 - 10
arch/ia64/configs/zx1_defconfig
View File 

@@ -1,9 +1,9 @@
 
-CONFIG_EXPERIMENTAL=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_SYSVIPC=y
 
 CONFIG_BSD_PROCESS_ACCT=y
 
 CONFIG_BSD_PROCESS_ACCT=y
 
 CONFIG_BLK_DEV_INITRD=y
 
 CONFIG_BLK_DEV_INITRD=y
 
 CONFIG_KPROBES=y
 
 CONFIG_KPROBES=y
 
 CONFIG_MODULES=y
 
 CONFIG_MODULES=y
 
+CONFIG_PARTITION_ADVANCED=y
 
 CONFIG_IA64_HP_ZX1=y
 
 CONFIG_IA64_HP_ZX1=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_MCKINLEY=y
 
 CONFIG_SMP=y
 
 CONFIG_SMP=y
 
@@ -18,6 +18,7 @@ CONFIG_EFI_VARS=y
 
 CONFIG_BINFMT_MISC=y
 
 CONFIG_BINFMT_MISC=y
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI=y
 
 CONFIG_HOTPLUG_PCI_ACPI=y
 
 CONFIG_HOTPLUG_PCI_ACPI=y
 
+CONFIG_NET=y
 
 CONFIG_PACKET=y
 
 CONFIG_PACKET=y
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX=y
 
 CONFIG_INET=y
 
 CONFIG_INET=y
 
@@ -37,9 +38,9 @@ CONFIG_CHR_DEV_OSST=y
 
 CONFIG_BLK_DEV_SR=y
 
 CONFIG_BLK_DEV_SR=y
 
 CONFIG_BLK_DEV_SR_VENDOR=y
 
 CONFIG_BLK_DEV_SR_VENDOR=y
 
 CONFIG_CHR_DEV_SG=y
 
 CONFIG_CHR_DEV_SG=y
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_LOGGING=y
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SYM53C8XX_2=y
 
 CONFIG_SCSI_SYM53C8XX_2=y
 
 CONFIG_SCSI_QLOGIC_1280=y
 
 CONFIG_SCSI_QLOGIC_1280=y
 
 CONFIG_FUSION=y
 
 CONFIG_FUSION=y
 
@@ -48,18 +49,15 @@ CONFIG_FUSION_FC=y
 
 CONFIG_FUSION_CTL=m
 
 CONFIG_FUSION_CTL=m
 
 CONFIG_NETDEVICES=y
 
 CONFIG_NETDEVICES=y
 
 CONFIG_DUMMY=y
 
 CONFIG_DUMMY=y
 
-CONFIG_NET_ETHERNET=y
 
+CONFIG_TIGON3=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_NET_TULIP=y
 
 CONFIG_TULIP=y
 
 CONFIG_TULIP=y
 
 CONFIG_TULIP_MWI=y
 
 CONFIG_TULIP_MWI=y
 
 CONFIG_TULIP_MMIO=y
 
 CONFIG_TULIP_MMIO=y
 
 CONFIG_TULIP_NAPI=y
 
 CONFIG_TULIP_NAPI=y
 
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 
-CONFIG_NET_PCI=y
 
-CONFIG_NET_VENDOR_INTEL=y
 
 CONFIG_E100=y
 
 CONFIG_E100=y
 
 CONFIG_E1000=y
 
 CONFIG_E1000=y
 
-CONFIG_TIGON3=y
 
 CONFIG_INPUT_JOYDEV=y
 
 CONFIG_INPUT_JOYDEV=y
 
 CONFIG_INPUT_EVDEV=y
 
 CONFIG_INPUT_EVDEV=y
 
 # CONFIG_INPUT_KEYBOARD is not set
 
 # CONFIG_INPUT_KEYBOARD is not set
 
@@ -100,7 +98,6 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_EXT2_FS=y
 
 CONFIG_EXT2_FS=y
 
 CONFIG_EXT2_FS_XATTR=y
 
 CONFIG_EXT2_FS_XATTR=y
 
 CONFIG_EXT3_FS=y
 
 CONFIG_EXT3_FS=y
 
-CONFIG_AUTOFS_FS=y
 
 CONFIG_ISO9660_FS=y
 
 CONFIG_ISO9660_FS=y
 
 CONFIG_JOLIET=y
 
 CONFIG_JOLIET=y
 
 CONFIG_UDF_FS=y
 
 CONFIG_UDF_FS=y
 
@@ -110,12 +107,9 @@ CONFIG_PROC_KCORE=y
 
 CONFIG_TMPFS=y
 
 CONFIG_TMPFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_HUGETLBFS=y
 
 CONFIG_NFS_FS=y
 
 CONFIG_NFS_FS=y
 
-CONFIG_NFS_V3=y
 
 CONFIG_NFS_V4=y
 
 CONFIG_NFS_V4=y
 
 CONFIG_NFSD=y
 
 CONFIG_NFSD=y
 
 CONFIG_NFSD_V3=y
 
 CONFIG_NFSD_V3=y
 
-CONFIG_PARTITION_ADVANCED=y
 
-CONFIG_EFI_PARTITION=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_NLS_CODEPAGE_737=y
 
 CONFIG_NLS_CODEPAGE_737=y
 
 CONFIG_NLS_CODEPAGE_775=y
 
 CONFIG_NLS_CODEPAGE_775=y