diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 12:31:20 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:16 -0600 |
| commit | 94086b00d51aa57d3544bb1391a5dedf349f9e40 (patch) | |
| tree | 7f97f8e945cf1ac49a09a833b6fa35cce192d16c /debian.master | |
| parent | b5c44a98a05c6780714b9297b95ed3d2ea25b1fb (diff) | |
UBUNTU: [Config] Enable CONFIG_LEDS_TRIGGER_DEFAULT_ON=m on powerpc
Per the non-modular module review, enable
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m on powerpc for consistency across all
flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
8 files changed, 1 insertions, 7 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 713ed8ef9df..53ef3704498 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -120,7 +120,6 @@ CONFIG_KSM=y # CONFIG_KTIME_SCALAR is not set CONFIG_KVM=m CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LIBERTAS_MESH=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 5786ed2b42f..6b24539e979 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -108,7 +108,6 @@ CONFIG_KGDB=y # CONFIG_KSM is not set CONFIG_KTIME_SCALAR=y CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=m # CONFIG_LIBERTAS_MESH is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 2f2a7143b8b..9835562098f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2705,6 +2705,7 @@ CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_GPIO=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set CONFIG_LEDS_WM831X_STATUS=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 8517c94cd6a..d3052ed1e7b 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -120,7 +120,6 @@ CONFIG_KSM=y CONFIG_KTIME_SCALAR=y CONFIG_KVM=m CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LIBERTAS_MESH=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc index 80173986935..ddc79c98978 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc +++ b/debian.master/config/powerpc/config.flavour.powerpc @@ -20,7 +20,6 @@ CONFIG_I2C_GPIO=m CONFIG_KERNEL_START=0xc0000000 CONFIG_KGDB=y CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_MAX_ACTIVE_REGIONS=32 # CONFIG_MMIO_NVRAM is not set # CONFIG_MPIC_U3_HT_IRQS is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index 9c59fd3ceef..351401b3917 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -20,7 +20,6 @@ CONFIG_I2C_GPIO=m CONFIG_KERNEL_START=0xc0000000 # CONFIG_KGDB is not set # CONFIG_LATENCYTOP is not set -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set CONFIG_MAX_ACTIVE_REGIONS=32 # CONFIG_MMIO_NVRAM is not set # CONFIG_MPIC_U3_HT_IRQS is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp index 34168ded700..41ea43c8b24 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp @@ -20,7 +20,6 @@ CONFIG_HUGETLB_PAGE=y CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KGDB=y CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_MAX_ACTIVE_REGIONS=256 CONFIG_MMIO_NVRAM=y CONFIG_MPIC_U3_HT_IRQS=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 6b73be0d300..259d0daa5ec 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -119,7 +119,6 @@ CONFIG_KGDB=y CONFIG_KSM=y CONFIG_KVM=y CONFIG_LATENCYTOP=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LIBERTAS_MESH=y |