diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 13:23:33 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:57:56 -0600 |
| commit | ba85f777a4779bdaee15b1582d056daf295e7f7b (patch) | |
| tree | db65102965e18a9774778b2f6254220fefba20c3 /debian.master | |
| parent | 0240a13f0b844d314d090d71fcf28e5e1d15398a (diff) | |
UBUNTU: [Config] Enable CONFIG_IPMI_HANDLER=m on arm
Per the non-modular module review, enable CONFIG_IPMI_HANDLER=m on arm
for consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 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 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 6d3d053c8a4..5241c55082c 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -113,7 +113,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INTEL_TXT=y CONFIG_INTR_REMAP=y CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_HANDLER=m # CONFIG_IRQ_PER_CPU is not set CONFIG_IWL3945=m CONFIG_IWMC3200TOP_DEBUGFS=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 965e0959b7b..e082a49add4 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -102,7 +102,6 @@ CONFIG_I2C_GPIO=m CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set # CONFIG_INTR_REMAP is not set -# CONFIG_IPMI_HANDLER is not set # CONFIG_IRQ_PER_CPU is not set CONFIG_IWL3945=m # CONFIG_IWMC3200TOP_DEBUGFS is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1e3311c823d..bb057f0fae5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2323,6 +2323,7 @@ CONFIG_IPDDP_DECAP=y CONFIG_IPDDP_ENCAP=y # CONFIG_IPIC is not set CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_POWEROFF=m CONFIG_IPMI_SI=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 275d14f6b77..005353f5948 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -112,7 +112,6 @@ CONFIG_ICPLUS_PHY=y CONFIG_ILLEGAL_POINTER_VALUE=0 # CONFIG_INTEL_TXT is not set # CONFIG_INTR_REMAP is not set -CONFIG_IPMI_HANDLER=m # CONFIG_IRQ_PER_CPU is not set CONFIG_ISA=y CONFIG_IWL3945=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 2b4aa1c7bf6..16feaf6f8bf 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -98,7 +98,6 @@ CONFIG_I2C_I801=m CONFIG_ICPLUS_PHY=m CONFIG_IDE=y CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_HANDLER=m # CONFIG_IRQ_ALL_CPUS is not set CONFIG_IRQ_PER_CPU=y # CONFIG_ISA is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 58c2cebb977..779831ff9d8 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -111,7 +111,6 @@ CONFIG_IBMEBUS=y CONFIG_ICPLUS_PHY=m CONFIG_IDE=y CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_HANDLER=m CONFIG_IRQ_ALL_CPUS=y CONFIG_IRQ_PER_CPU=y # CONFIG_IWL3945 is not set |