diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 11:39:32 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:26:47 -0700 |
| commit | b56b3099031a3e29941da90d3abf28293279b12f (patch) | |
| tree | 4eebb98cecac687e6d03fb77946d4a4bacf2c3c0 /debian.master/config | |
| parent | 9ad6243d148830b14625c4502605c62a6f67e976 (diff) | |
UBUNTU: [Config] Enable CONFIG_HOTPLUG_PCI_CPCI=y on powerpc
Per the non-modular module review, CONFIG_HOTPLUG_PCI=y was set. As a
secondary action, enable CONFIG_HOTPLUG_PCI_CPCI=y on powerpc for
consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master/config')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
5 files changed, 1 insertions, 4 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index b7e9d504489..6dc7742b3fa 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -100,7 +100,6 @@ CONFIG_GPIO_VX855=m CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HP_ILO=m CONFIG_HUGETLB_PAGE=y CONFIG_HZ=100 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ef412d2a175..c712d38563c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2001,6 +2001,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_COMPAQ=m CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y +CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_FAKE=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 946b0bef274..7ea48f38059 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -100,7 +100,6 @@ CONFIG_HAVE_AOUT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIGHMEM=y -CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HP_ILO=m CONFIG_HUGETLB_PAGE=y CONFIG_HZ=250 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 7637f251b0e..d637f4eda10 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -87,7 +87,6 @@ CONFIG_GPIO_VX855=m # CONFIG_HAVE_AOUT is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HIGHMEM=y -# CONFIG_HOTPLUG_PCI_CPCI is not set # CONFIG_HVC_CONSOLE is not set CONFIG_HZ=250 # CONFIG_HZ_100 is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index be28a33e3f5..6d1712dbcc3 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -98,7 +98,6 @@ CONFIG_GPIO_VX855=m # CONFIG_HAVE_AOUT is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_SETUP_PER_CPU_AREA=y -# CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HP_ILO=m CONFIG_HUGETLB_PAGE=y CONFIG_HVC_CONSOLE=y |