[kernel] r19640 - dists/trunk/linux/debian/config

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 22:52:15 2012
New Revision: 19640

Log:
Explicitly set defaults for some new driver config variables

Modified:
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Dec 23 22:41:41 2012	(r19639)
+++ dists/trunk/linux/debian/config/config	Sun Dec 23 22:52:15 2012	(r19640)
@@ -132,6 +132,7 @@
 CONFIG_SATA_SX4=m
 CONFIG_ATA_BMDMA=y
 CONFIG_ATA_PIIX=m
+# CONFIG_SATA_HIGHBANK is not set
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
@@ -274,6 +275,11 @@
 CONFIG_BT_WILINK=m
 
 ##
+## file: drivers/bus/Kconfig
+##
+# CONFIG_OMAP_OCP2SCP is not set
+
+##
 ## file: drivers/char/Kconfig
 ##
 # CONFIG_DEVKMEM is not set
@@ -1719,6 +1725,7 @@
 CONFIG_MTD_M25P80=m
 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MTD_SST25L=m
+# CONFIG_MTD_DOCG3 is not set
 
 ##
 ## file: drivers/mtd/lpddr/Kconfig
@@ -1744,6 +1751,7 @@
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_DOCG4 is not set
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_CS553X=m
 CONFIG_MTD_NAND_NANDSIM=m
@@ -1912,6 +1920,11 @@
 CONFIG_CHELSIO_T4VF=m
 
 ##
+## file: drivers/net/ethernet/cirrus/Kconfig
+##
+# CONFIG_CS89x0_PLATFORM is not set
+
+##
 ## file: drivers/net/ethernet/cisco/Kconfig
 ##
 CONFIG_NET_VENDOR_CISCO=y
@@ -1962,6 +1975,7 @@
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
@@ -1985,6 +1999,7 @@
 ## file: drivers/net/ethernet/mellanox/mlx4/Kconfig
 ##
 CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_DEBUG=y
 
 ##
@@ -2051,6 +2066,11 @@
 CONFIG_NETXEN_NIC=m
 
 ##
+## file: drivers/net/ethernet/racal/Kconfig
+##
+CONFIG_NET_VENDOR_RACAL=y
+
+##
 ## file: drivers/net/ethernet/rdc/Kconfig
 ##
 CONFIG_NET_VENDOR_RDC=y
@@ -4231,6 +4251,7 @@
 ## file: net/batman-adv/Kconfig
 ##
 CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 
 ##
@@ -4504,6 +4525,7 @@
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 
 ##
@@ -4656,6 +4678,11 @@
 CONFIG_NFC=m
 
 ##
+## file: net/nfc/hci/Kconfig
+##
+# CONFIG_NFC_HCI is not set
+
+##
 ## file: net/nfc/nci/Kconfig
 ##
 CONFIG_NFC_NCI=m