aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-25 12:25:33 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-09-12 09:11:01 -0600
commit297f035e22e1dc57c9925f33626a6e2f170db398 (patch)
tree2c1feb56e7718b52427d5b86bbac1717763f9826 /debian.master
parent2bf8468500b1c5fe145c16eab6c48defef082d2d (diff)
UBUNTU: [Config] Enable CONFIG_LEDS_PCA9532=m on powerpc
Per the non-modular module review, enable CONFIG_LEDS_PCA9532=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.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
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 b759824eee2..461739ec63d 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_PCA9532=m
CONFIG_LEDS_PCA955X=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index e22961fc388..c008c4ae273 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_PCA9532=m
CONFIG_LEDS_PCA955X=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index aa714a11bdd..8611e4e55b4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2698,6 +2698,7 @@ CONFIG_LEDS_LT3593=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_NET48XX=m
CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_PCA9532=m
CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PWM=m
CONFIG_LEDS_REGULATOR=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 519c3016f85..85b41960613 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_PCA9532=m
CONFIG_LEDS_PCA955X=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4baa75a905f..f703dcb338b 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_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_TIMER=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 018288b7485..096a8fe8823 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_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=y