From 883d390b64f9f230daa41cbcb77f61225308e17e Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Tue, 27 Sep 2016 11:54:38 -0700 Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_IBMVNIC=m Also enforce this in the annotations file. BugLink: http://bugs.launchpad.net/bugs/1628187 Signed-off-by: Leann Ogasawara --- debian.master/config/annotations | 3 +++ debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index fff3a4c10238..3cfd2d8e3ffc 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -4218,6 +4218,9 @@ CONFIG_FS_ENET_MDIO_FCC policy<{'powerpc-powerpc-e500mc' CONFIG_NET_VENDOR_IBM policy<{'powerpc-generic': 'y', 'ppc64el': 'y'}> CONFIG_IBMVETH policy<{'powerpc-generic': 'm', 'ppc64el': 'y'}> CONFIG_EHEA policy<{'ppc64el': 'y'}> +CONFIG_IBMVNIC policy<{'powerpc-generic': 'm', 'ppc64el': 'm'}> +# +CONFIG_IBMVNIC mark note # Menu: Device Drivers >> Network device support >> Ethernet driver support >> IBM devices >> IBM EMAC Ethernet support diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 931e1500b406..18f358ab13e4 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3406,7 +3406,7 @@ CONFIG_IAQCORE=m CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_IBMVIO=y -# CONFIG_IBMVNIC is not set +CONFIG_IBMVNIC=m CONFIG_IBM_ASM=m CONFIG_IBM_BSR=m # CONFIG_IBM_EMAC_EMAC4 is not set -- 2.39.5