- new 2.6.27 options, part 2.

Changed files:
    kernel-multiarch.config -> 1.1.2.55

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index b8241791aef0b433c89e9c21ba762ae9cea8aefc..fade6f0c62dd9db5deea07781cbe3cfb466be7f3 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -8,6 +8,7 @@ BLK_DEV_IO_TRACE all=n
 LSF all=y
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
+
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -303,6 +304,7 @@ ATA_OVER_ETH all=m
 SUNVDC sparc64=m
 #- file drivers/s390/block/Kconfig goes here
 VIRTIO_BLK all=m
+BLK_DEV_HD all=n
 
 #-
 #- *** FILE: drivers/block/paride/Kconfig ***
@@ -1778,8 +1780,11 @@ TIFM_7XX1 all=m
 ACER_WMI all=m
 ASUS_LAPTOP i386=m x86_64=m
 FUJITSU_LAPTOP all=m
+FUJITSU_LAPTOP_DEBUG all=n
 TC1100_WMI all=m
+HP_WMI all=m
 MSI_LAPTOP i386=m x86_64=m
+COMPAL_LAPTOP all=m
 SONY_LAPTOP i386=m x86_64=m
 SONYPI_COMPAT i386=y x86_64=y
 THINKPAD_ACPI i386=m x86_64=m
@@ -1790,7 +1795,10 @@ THINKPAD_ACPI_HOTKEY_POLL all=y
 INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
 ENCLOSURE_SERVICES all=m
-SGI_XP ia64=m
+SGI_XP ia64=m x86_64=m
+HP_ILO all=m
+SGI_GRU ia64=m x86_64=m
+SGI_GRU_DEBUG ia64=n x86_64=n
 
 #-
 #- *** FILE: drivers/mmc/Kconfig ***
@@ -2087,7 +2095,7 @@ SIS900 all=m
 EPIC100 all=m
 SUNDANCE all=m
 SUNDANCE_MMIO all=n sparc=y sparc64=y
-TLAN i386=m ppc=n sparc=n
+TLAN i386=m x86_64=m ppc=n sparc=n
 VIA_RHINE all=m
 VIA_RHINE_MMIO all=y alpha=n
 VIA_RHINE_NAPI all=y alpha=n
@@ -2110,6 +2118,7 @@ E1000_DISABLE_PACKET_SPLIT all=y ia64=n
 E1000E all=m
 IP1000 all=m
 IGB all=m
+IGB_LRO all=y
 #- file drivers/net/ixp2000/Kconfig goes here
 MYRI_SBUS sparc=m sparc64=m
 NS83820 all=m
@@ -2132,6 +2141,7 @@ GFAR_NAPI ppc=n
 MV643XX_ETH ppc=m
 QLA3XXX all=m sparc=n
 ATL1 all=m sparc=n
+ATL1E all=m
 NETDEV_10000 all=y
 CHELSIO_T1 all=m sparc=n
 CHELSIO_T1_1G all=y
@@ -2462,14 +2472,7 @@ USB_NET_RNDIS_WLAN all=m
 RTL8180 all=m
 RTL8187 all=m
 ADM8211 all=m
-#- file drivers/net/wireless/p54/Kconfig goes here
-#- file drivers/net/wireless/ath5k/Kconfig goes here
-#- file drivers/net/wireless/iwlwifi/Kconfig goes here
-#- file drivers/net/wireless/hostap/Kconfig goes here
-#- file drivers/net/wireless/b43/Kconfig goes here
-#- file drivers/net/wireless/b43legacy/Kconfig goes here
-#- file drivers/net/wireless/zd1211rw/Kconfig goes here
-#- file drivers/net/wireless/rt2x00/Kconfig goes here
+MAC80211_HWSIM all=m
 
 #-
 #- *** FILE: drivers/net/wireless/ath5k/Kconfig ***
@@ -2477,6 +2480,11 @@ ADM8211 all=m
 ATH5K all=m
 ATH5K_DEBUG all=n
 
+#-
+#- *** FILE: drivers/net/wireless/ath9k/Kconfig ***
+#-
+ATH9K all=m
+
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
 #-
@@ -2506,16 +2514,25 @@ HOSTAP_CS all=m
 #-
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
+IWLCORE all=m
+IWLAGN all=m
+IWLAGN_SPECTRUM_MEASUREMENT all=y
+IWLAGN_LEDS all=y
 IWLWIFI_RFKILL all=y
-IWL4965 all=m
+IWLWIFI_DEBUG all=n
+
+IWL4965 all=y
 IWL4965_HT all=y
 IWL4965_LEDS all=y
 IWL4965_SPECTRUM_MEASUREMENT all=y
 IWL4965_SENSITIVITY all=y
-IWLWIFI_DEBUG all=n
+
+IWL5000 all=y
+
 IWL3945 all=m
-IWL3945_SPECTRUM_MEASUREMENT all=y
 IWL3945_LEDS all=y
+IWL3945_RFKILL all=y
+IWL3945_SPECTRUM_MEASUREMENT all=y
 IWL3945_DEBUG all=n
 
 #-
@@ -2877,6 +2894,15 @@ AIC7XXX_REG_PRETTY_PRINT all=y
 SCSI_AIC94XX all=m sparc=n
 AIC94XX_DEBUG all=n
 
+#-
+#- *** FILE: drivers/scsci/device_handler/Kconfig ***
+#-
+SCSI_DH all=m
+SCSI_DH_RDAC all=m
+SCSI_DH_HP_SW all=m
+SCSI_DH_EMC all=m
+SCSI_DH_ALUA all=m
+
 #-
 #- *** FILE: drivers/scsi/libsas/Kconfig ***
 #-
@@ -3873,7 +3899,6 @@ MODVERSIONS all=n
 MODULE_SRCVERSION_ALL all=n
 KMOD all=y
 STOP_MACHINE all=y
-#- file block/Kconfig goes here
 
 #-
 #- *** FILE: kernel/Kconfig.hz ***