]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
UBUNTU: [Config] Fix up s390x config options changed during 4.10 rebase
authorSeth Forshee <seth.forshee@canonical.com>
Thu, 19 Jan 2017 22:05:12 +0000 (16:05 -0600)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 20 Feb 2017 03:57:58 +0000 (20:57 -0700)
commit3d0c2eb99bdbd0a985a7a3a794ff802a2906f687
tree3798419866bbcdb8040ffaeee831cf376c56535b
parentfe664a0e884ba37dc93d987cd7b27d2a48f11ea6
UBUNTU: [Config] Fix up s390x config options changed during 4.10 rebase

Fix the following options mistakenly changed during the rebase
from 4.9 to 4.10.

 - CONFIG_I2C was selected by CONFIG_SFC_FALCON but should be
   disabled because s390x lacks hw support. Revert these and
   related options, and enforce the CONFIG_I2C values to prevent
   this in the future.

 - Change CONFIG_LPC_SCH from m to n.

 - Change CONFIG_NVMEM from m to n.

 - Change CONFIG_REGULATOR from m to n.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
debian.master/config/amd64/config.common.amd64
debian.master/config/annotations
debian.master/config/arm64/config.common.arm64
debian.master/config/armhf/config.common.armhf
debian.master/config/config.common.ubuntu
debian.master/config/i386/config.common.i386
debian.master/config/powerpc/config.common.powerpc
debian.master/config/ppc64el/config.common.ppc64el
debian.master/config/s390x/config.common.s390x