summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-24 09:32:31 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-24 09:32:31 -0400
commitea3aaf7b014b4bd0237dd42603f56c30730f6a0d (patch)
tree3f15b529a7d689e58ad64fdf55469375c3171b09 /config-generic
parent4d5b4fb36b4d5a01b2267e5c39ba650ce04aca40 (diff)
downloadkernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.tar.gz
kernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.tar.xz
kernel-ea3aaf7b014b4bd0237dd42603f56c30730f6a0d.zip
Linux v4.5-12149-gaca04ce
- net, pwm, target, platform-drivers merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 9bccf5ec0..cbbf49eeb 100644
--- a/config-generic
+++ b/config-generic
@@ -1459,6 +1459,7 @@ CONFIG_CHELSIO_T4=m
CONFIG_CHELSIO_T4VF=m
CONFIG_CHELSIO_T4_DCB=y
# CONFIG_CHELSIO_T4_FCOE is not set
+# CONFIG_CHELSIO_T4_UWIRE is not set
CONFIG_NET_VENDOR_CISCO=y
CONFIG_ENIC=m