diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 12:27:37 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:14 -0600 |
| commit | b5c44a98a05c6780714b9297b95ed3d2ea25b1fb (patch) | |
| tree | 6c11fa06f7326fd4a7be91859d8eb5c0d33d3787 /debian.master | |
| parent | 13000b459985f7efe261ede9f11de31fd5cef0ac (diff) | |
UBUNTU: [Config] Enable CONFIG_LEDS_PCA955X=m on powerpc
Per the non-modular module review, enable CONFIG_LEDS_PCA955X=m on
powerpc 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 461739ec63d..713ed8ef9df 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_PCA955X=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_TIMER=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index c008c4ae273..5786ed2b42f 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_PCA955X=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8611e4e55b4..2f2a7143b8b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2700,6 +2700,7 @@ CONFIG_LEDS_NET48XX=m CONFIG_LEDS_NET5501=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_TRIGGERS=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 85b41960613..8517c94cd6a 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_PCA955X=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_TIMER=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index f703dcb338b..92b10511969 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -104,7 +104,6 @@ CONFIG_IRQ_PER_CPU=y CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KSM=y CONFIG_KVM=y -# CONFIG_LEDS_PCA955X is not set CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LIBERTAS_MESH=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 096a8fe8823..6b73be0d300 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_PCA955X is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=y |