| Message ID | 1436460258-22898-1-git-send-email-chris.j.arges@canonical.com |
|---|---|
| State | New |
| Headers | show |
Applied to the Trusty master-next branch
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index f9bd43a..c699f94 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -209,7 +209,6 @@ CONFIG_UIO_CIF=m CONFIG_UIO_DMEM_GENIRQ=m CONFIG_UIO_MF624=m CONFIG_UIO_NETX=m -CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SERCOS3=m CONFIG_UNUSED_SYMBOLS=y diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 530b4ce..8c94969 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -167,7 +167,6 @@ CONFIG_UIO_CIF=m CONFIG_UIO_DMEM_GENIRQ=m CONFIG_UIO_MF624=m CONFIG_UIO_NETX=m -CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SERCOS3=m CONFIG_UNUSED_SYMBOLS=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 946376c..233d861 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -183,7 +183,6 @@ CONFIG_UIO_CIF=m CONFIG_UIO_DMEM_GENIRQ=m CONFIG_UIO_MF624=m CONFIG_UIO_NETX=m -CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SERCOS3=m CONFIG_UNUSED_SYMBOLS=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 907a2c0..418bced 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6671,6 +6671,7 @@ CONFIG_UHID=m CONFIG_UID16=y CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_UIO=m +CONFIG_UIO_PCI_GENERIC=m CONFIG_ULI526X=m CONFIG_ULTRA=m CONFIG_ULTRIX_PARTITION=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 13a6ab1..1755fce 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -207,7 +207,6 @@ CONFIG_UIO_CIF=m CONFIG_UIO_DMEM_GENIRQ=m CONFIG_UIO_MF624=m CONFIG_UIO_NETX=m -CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SERCOS3=m CONFIG_UNUSED_SYMBOLS=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 3973fd8..e0f4488 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -232,7 +232,6 @@ CONFIG_UIO_CIF=m CONFIG_UIO_DMEM_GENIRQ=m CONFIG_UIO_MF624=m CONFIG_UIO_NETX=m -CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SERCOS3=m CONFIG_UNUSED_SYMBOLS=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index a204c59..6785676 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -269,7 +269,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_UIO_DMEM_GENIRQ is not set # CONFIG_UIO_MF624 is not set # CONFIG_UIO_NETX is not set -# CONFIG_UIO_PCI_GENERIC is not set # CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_SERCOS3 is not set # CONFIG_UNUSED_SYMBOLS is not set
BugLink: http://bugs.launchpad.net/bugs/1473109 Ensure all arches build UIO_PCI_GENERIC as a module. Signed-off-by: Chris J Arges <chris.j.arges@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - 7 files changed, 1 insertion(+), 6 deletions(-)