Enable various new (or newish) drivers and features

svn path=/dists/trunk/linux/; revision=19639

5 files changed, 73 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 49137103e1f8..88ced3612620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,22 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low
   * [i386] comedi: Re-enable COMEDI_ISA_DRIVERS
   * [i386,alpha] media/radio: Enable V4L_RADIO_ISA_DRIVERS and re-enable
     the ISA drivers
+  * PCI: Enable PCI_REALLOC_ENABLE_AUTO
+  * [x86] PCI: Enable PCI_PRI, PCI_PASID, PCI_IOAPIC
+  * [amd64] ACPI: Enable ACPI_BGRT
+  * net: Enable INET_UDP_DIAG, NET_IPVTI, PACKET_DIAG, UNIX_DIAG as modules
+  * netfilter: Enable NF_NAT_IPV6, IP6_NF_TARGET_MASQUERADE, IP6_NF_TARGET_NPT,
+    NF_CT_NETLINK_HELPER as modules
+  * net/sched: Enable NET_EMATCH_CANID, NET_EMATCH_IPSET as modules
+  * can: Enable CAN_PEAK_PCIEC, CAN_PEAK_PCMCIA, CAN_PEAK_USB as modules
+  * [i386] can: Enable CAN_CC770, CAN_CC770_ISA as module
+  * block: Enable BLK_DEV_NVME, BLK_DEV_PCIESSD_MTIP32XX as modules
+  * qla2xxx: Enable TCM_QLA2XXX as module
+  * team: Enable NET_TEAM_MODE_BROADCAST as module
+  * net: Enable VXLAN as module
+  * phy: Enable AT803X_PHY as module
+  * rt2800pci: Enable RT2800PCI_RT3290
+  * wireless/ti: Enable WL18XX as module
 
  -- maximilian attems <maks@debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 
diff --git a/debian/config/config b/debian/config/config
index b0767bb7c8a9..f2ec6344a27c 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -110,6 +110,11 @@ CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 
 ##
+## file: drivers/acpi/Kconfig
+##
+# CONFIG_ACPI_BGRT is not set
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
@@ -233,6 +238,7 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -251,6 +257,11 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 
 ##
+## file: drivers/block/mtip32xx/Kconfig
+##
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+
+##
 ## file: drivers/bluetooth/Kconfig
 ##
 CONFIG_BT_HCIBTUSB=m
@@ -1767,6 +1778,7 @@ CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_TUN=m
@@ -1803,6 +1815,11 @@ CONFIG_CAN_MCP251X=m
 # CONFIG_CAN_C_CAN is not set
 
 ##
+## file: drivers/net/can/cc770/Kconfig
+##
+# CONFIG_CAN_CC770 is not set
+
+##
 ## file: drivers/net/can/sja1000/Kconfig
 ##
 CONFIG_CAN_SJA1000=m
@@ -1810,7 +1827,9 @@ CONFIG_CAN_SJA1000_ISA=m
 # CONFIG_CAN_SJA1000_PLATFORM is not set
 CONFIG_CAN_EMS_PCMCIA=m
 CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCMCIA=m
 CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_TSCAN1=m
@@ -1826,6 +1845,7 @@ CONFIG_CAN_SOFTING_CS=m
 ##
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_PEAK_USB=m
 
 ##
 ## file: drivers/net/ethernet/Kconfig
@@ -2151,6 +2171,7 @@ CONFIG_MCS_FIR=m
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_PHYLIB=m
+CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_BCM87XX_PHY=m
 CONFIG_MARVELL_PHY=m
@@ -2204,6 +2225,7 @@ CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
 
 ##
 ## file: drivers/net/usb/Kconfig
@@ -2425,6 +2447,7 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2467,6 +2490,11 @@ CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 
 ##
+## file: drivers/net/wireless/ti/wl18xx/Kconfig
+##
+CONFIG_WL18XX=m
+
+##
 ## file: drivers/net/wireless/ti/wlcore/Kconfig
 ##
 CONFIG_WLCORE_SDIO=m
@@ -2505,9 +2533,12 @@ CONFIG_PARPORT_1284=y
 ##
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
 
 ##
 ## file: drivers/pci/hotplug/Kconfig
@@ -2838,6 +2869,7 @@ CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 ## file: drivers/scsi/qla2xxx/Kconfig
 ##
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 
 ##
 ## file: drivers/scsi/qla4xxx/Kconfig
@@ -4336,6 +4368,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -4344,6 +4377,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -4439,6 +4473,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
 
 ##
 ## file: net/l2tp/Kconfig
@@ -4497,6 +4534,8 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=y
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_SET=m
@@ -4630,6 +4669,7 @@ CONFIG_OPENVSWITCH=m
 ## file: net/packet/Kconfig
 ##
 CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
 
 ##
 ## file: net/phonet/Kconfig
@@ -4702,7 +4742,8 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -4745,6 +4786,7 @@ CONFIG_TIPC_PORTS=8191
 ## file: net/unix/Kconfig
 ##
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 
 ##
 ## file: net/wimax/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index b34e75c0f452..5ad4254cf507 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1071,6 +1071,9 @@ CONFIG_PCMCIA_HERMES=m
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_HT_IRQ=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
 
 ##
 ## file: drivers/pci/hotplug/Kconfig
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 5026db574f7e..262841559778 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -238,6 +238,12 @@ CONFIG_MTD_PCMCIA=m
 CONFIG_ARCNET_COM20020_ISA=m
 
 ##
+## file: drivers/net/can/cc770/Kconfig
+##
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+
+##
 ## file: drivers/net/ethernet/3com/Kconfig
 ##
 CONFIG_NET_VENDOR_3COM=y
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 0840ec2242aa..59aafb8872f3 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -40,6 +40,11 @@ CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 ##
+## file: drivers/acpi/Kconfig
+##
+CONFIG_ACPI_BGRT=y
+
+##
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_RAM_SIZE=65536