[linux] 03/04: net: Enable LIQUIDIO as module

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 0bac3c030619b49ad39f73e3d0deda9deb209e28
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 19 21:12:06 2015 +0100

    net: Enable LIQUIDIO as module
---
 debian/changelog     | 1 +
 debian/config/config | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5af3c34..45e0449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (4.2.3-3) UNRELEASED; urgency=medium
   * [x86] drm: Enable DRM_AMDGPU as module
   * media: Enable DVB_AS102, VIDEO_GO7007, VIDEO_GO7007_USB,
     VIDEO_GO7007_LOADER, VIDEO_GO7007_USB_S2250_BOARD as modules
+  * net: Enable LIQUIDIO as module
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Mon, 19 Oct 2015 21:23:18 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 3525b95..157efd7 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2599,6 +2599,12 @@ CONFIG_NET_CADENCE=y
 # CONFIG_NET_CALXEDA_XGMAC is not set
 
 ##
+## file: drivers/net/ethernet/cavium/Kconfig
+##
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_LIQUIDIO=m
+
+##
 ## file: drivers/net/ethernet/chelsio/Kconfig
 ##
 CONFIG_NET_VENDOR_CHELSIO=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git