[PATCH] UBUNTU: [Config]: Set CONFIG_PINCTRL_CANNONLAKE=y

[Thadeu Lima de Souza Cascardo]

BugLink: http://bugs.launchpad.net/bugs/1757346

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian.master/abi/4.15.0-15.16/amd64/generic.modules    | 2 --
 debian.master/abi/4.15.0-15.16/amd64/lowlatency.modules | 2 --
 debian.master/abi/4.15.0-15.16/i386/generic.modules     | 2 --
 debian.master/abi/4.15.0-15.16/i386/lowlatency.modules  | 2 --
 debian.master/config/annotations                        | 2 +-
 debian.master/config/config.common.ubuntu               | 4 ++--
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian.master/abi/4.15.0-15.16/amd64/generic.modules b/debian.master/abi/4.15.0-15.16/amd64/generic.modules
index e10c14a063bd..0aa876b13424 100644
--- a/debian.master/abi/4.15.0-15.16/amd64/generic.modules
+++ b/debian.master/abi/4.15.0-15.16/amd64/generic.modules
@@ -3187,11 +3187,9 @@ phy-tusb1210
 physmap
 pi433
 pinctrl-broxton
-pinctrl-cannonlake
 pinctrl-cedarfork
 pinctrl-denverton
 pinctrl-geminilake
-pinctrl-intel
 pinctrl-lewisburg
 pinctrl-mcp23s08
 pinctrl-sunrisepoint
diff --git a/debian.master/abi/4.15.0-15.16/amd64/lowlatency.modules b/debian.master/abi/4.15.0-15.16/amd64/lowlatency.modules
index 4c44a81a53e6..5e5e43c972d9 100644
--- a/debian.master/abi/4.15.0-15.16/amd64/lowlatency.modules
+++ b/debian.master/abi/4.15.0-15.16/amd64/lowlatency.modules
@@ -3188,11 +3188,9 @@ phy-tusb1210
 physmap
 pi433
 pinctrl-broxton
-pinctrl-cannonlake
 pinctrl-cedarfork
 pinctrl-denverton
 pinctrl-geminilake
-pinctrl-intel
 pinctrl-lewisburg
 pinctrl-mcp23s08
 pinctrl-sunrisepoint
diff --git a/debian.master/abi/4.15.0-15.16/i386/generic.modules b/debian.master/abi/4.15.0-15.16/i386/generic.modules
index 6afb94de2e5b..13f80347f544 100644
--- a/debian.master/abi/4.15.0-15.16/i386/generic.modules
+++ b/debian.master/abi/4.15.0-15.16/i386/generic.modules
@@ -3225,12 +3225,10 @@ phy-tusb1210
 physmap
 pi433
 pinctrl-broxton
-pinctrl-cannonlake
 pinctrl-cedarfork
 pinctrl-cherryview
 pinctrl-denverton
 pinctrl-geminilake
-pinctrl-intel
 pinctrl-lewisburg
 pinctrl-mcp23s08
 pinctrl-sunrisepoint
diff --git a/debian.master/abi/4.15.0-15.16/i386/lowlatency.modules b/debian.master/abi/4.15.0-15.16/i386/lowlatency.modules
index 3ede29c6fd2f..fc5651126246 100644
--- a/debian.master/abi/4.15.0-15.16/i386/lowlatency.modules
+++ b/debian.master/abi/4.15.0-15.16/i386/lowlatency.modules
@@ -3226,12 +3226,10 @@ phy-tusb1210
 physmap
 pi433
 pinctrl-broxton
-pinctrl-cannonlake
 pinctrl-cedarfork
 pinctrl-cherryview
 pinctrl-denverton
 pinctrl-geminilake
-pinctrl-intel
 pinctrl-lewisburg
 pinctrl-mcp23s08
 pinctrl-sunrisepoint
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 008d87722b7d..5d8144bfba41 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5956,7 +5956,7 @@ CONFIG_PINCTRL_BAYTRAIL                         policy<{'amd64': 'y', 'i386': 'y
 CONFIG_PINCTRL_CHERRYVIEW                       policy<{'amd64': 'y', 'i386': 'm'}>
 CONFIG_PINCTRL_MERRIFIELD                       policy<{'i386': 'n'}>
 CONFIG_PINCTRL_BROXTON                          policy<{'amd64': 'm', 'i386': 'm'}>
-CONFIG_PINCTRL_CANNONLAKE                       policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_PINCTRL_CANNONLAKE                       policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_PINCTRL_CEDARFORK                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_PINCTRL_DENVERTON                        policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_PINCTRL_GEMINILAKE                       policy<{'amd64': 'm', 'i386': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ea153e120eb3..5ff32cb997e9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6656,7 +6656,7 @@ CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_BERLIN=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CANNONLAKE=y
 CONFIG_PINCTRL_CEDARFORK=m
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_DOVE=y
@@ -6672,7 +6672,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_IMX6UL=y
 CONFIG_PINCTRL_IMX7D=y
-CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_INTEL=y
 CONFIG_PINCTRL_IPQ4019=m
 CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_IPQ8074=m
-- 
2.15.1