diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 12:37:37 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:19 -0600 |
| commit | a53d4379fbd9adfd23ecfee4e86c4d71622f56bb (patch) | |
| tree | 1f40a1265a2e4b788aefdf75d5b160947d6c0f9e /debian.master | |
| parent | 4e7817a896f172fb2b15de0a9042168dd212d7c6 (diff) | |
UBUNTU: [Config] Set CONFIG_LEDS_TRIGGER_TIMER=m on powerpc
Per the non-modular module review, set CONFIG_LEDS_TRIGGER_TIMER=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 92074b316cb..238c40cafae 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_TIMER=m CONFIG_LIBERTAS_MESH=y CONFIG_LIBIPW_DEBUG=y CONFIG_LINE6_USB=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 9535b6257b3..3efdfa9ba4b 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_TIMER=m # CONFIG_LIBERTAS_MESH is not set CONFIG_LIBIPW_DEBUG=y # CONFIG_LINE6_USB is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e132b508847..6515f331a97 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2709,6 +2709,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_WM8350=m CONFIG_LEDS_WRAP=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 01d2ea47040..21ea71c5df3 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_TIMER=m CONFIG_LIBERTAS_MESH=y CONFIG_LIBIPW_DEBUG=y CONFIG_LINE6_USB=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index ca1a00851cf..1a10d1c13b2 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_TRIGGER_TIMER=y CONFIG_LIBERTAS_MESH=y # CONFIG_LIBIPW_DEBUG is not set # CONFIG_LINE6_USB is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 848a5423cfa..161b966e5af 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_TIMER=y CONFIG_LIBERTAS_MESH=y # CONFIG_LIBIPW_DEBUG is not set # CONFIG_LINE6_USB is not set |