From: Seth Forshee <seth.forshee@canonical.com>
Date: Mon, 21 Nov 2016 16:07:36 +0000 (-0600)
Subject: UBUNTU: [Config] Set CONFIG_PWM_PCA9685=m for amd64 and i386
X-Git-Tag: Ubuntu-4.10.0-9.11~189
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=572108f1a1cbae3896f94a37281ef4f7b4e9f0df;p=mirror_ubuntu-zesty-kernel.git

UBUNTU: [Config] Set CONFIG_PWM_PCA9685=m for amd64 and i386

Also update annotations.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 1086dda3eb76..00444fd29146 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -347,7 +347,6 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
-# CONFIG_PWM_PCA9685 is not set
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1d2fff7416e2..edaf39920e3d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5047,7 +5047,7 @@ CONFIG_PWM_LP3943                               policy<{'amd64': 'm', 'arm64': '
 CONFIG_PWM_LPSS                                 policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_PWM_LPSS_PCI                             policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_PWM_LPSS_PLATFORM                        policy<{'amd64': 'm', 'i386': 'm'}>
-CONFIG_PWM_PCA9685                              policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
+CONFIG_PWM_PCA9685                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_PWM_RENESAS_TPU                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PWM_SAMSUNG                              policy<{'armhf': 'm'}>
 CONFIG_PWM_TEGRA                                policy<{'armhf-generic': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 26d481bd1ed1..844d22fdf2c2 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -364,7 +364,6 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
-CONFIG_PWM_PCA9685=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 7c6bcfd28c8d..b930bc0abdc9 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -347,7 +347,6 @@ CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=y
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_PWM_PCA9685=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cc47dcfc64b1..e99c8d6961d1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6463,6 +6463,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_OMAP_DMTIMER=m
+CONFIG_PWM_PCA9685=m
 CONFIG_PWM_RCAR=m
 CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index df9214df2398..de9988f662d8 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -340,7 +340,6 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
-# CONFIG_PWM_PCA9685 is not set
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9b3b9610846a..9d99d035303d 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -321,7 +321,6 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
-CONFIG_PWM_PCA9685=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 7c7b5a7ebc7a..f4369ac1f0c6 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -386,7 +386,6 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_PWM_PCA9685=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_R3964=m