diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 12:27:37 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:40:44 -0700 |
| commit | af6fb16f0032f90221305cdd23ebb437308d6d68 (patch) | |
| tree | 021450c9076680522a16aa89456b0aeaf06fa0eb | |
| parent | 7751a63708988b258ce0945706f2deec391454c2 (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>
| -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 6e407039dca..0fce1b9dbbe 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -123,7 +123,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 bc59e8c498f..e6b6aa6b324 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -110,7 +110,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 294f52e7dcd..cb70de15caf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2741,6 +2741,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 a27b12254d4..c076ed5d848 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -122,7 +122,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 5cae62b333e..eda0d356314 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -106,7 +106,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 e4ff5dad8c4..570d33f41ed 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -121,7 +121,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 |