diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 12:10:24 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:07 -0600 |
| commit | fa465f8cf3dbdb0e9d6ad7b21d17976b11d1ede6 (patch) | |
| tree | 21f6fde281dc733630f9d5804c5483d2de844c25 /debian.master | |
| parent | e8d770e848ebc1ee18a0cb630262e2140e1f90bd (diff) | |
UBUNTU: [Config] Enable CONFIG_LAPBETHER=m on arm
Per the non-modular module review, enable CONFIG_LAPBETHER=m on arm 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 50ddd3676d1..9e825f19300 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -119,7 +119,6 @@ CONFIG_KGDB=y CONFIG_KSM=y # CONFIG_KTIME_SCALAR is not set CONFIG_KVM=m -CONFIG_LAPBETHER=m CONFIG_LATENCYTOP=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_PCA9532=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 467b65cb81e..46eb0c0d0ef 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -107,7 +107,6 @@ CONFIG_ICPLUS_PHY=y CONFIG_KGDB=y # CONFIG_KSM is not set CONFIG_KTIME_SCALAR=y -# CONFIG_LAPBETHER is not set CONFIG_LATENCYTOP=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_PCA9532=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d4338d47ed9..8819d65ccc6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2661,6 +2661,7 @@ CONFIG_L2TP_DEBUGFS=m CONFIG_LANCE=m CONFIG_LANMEDIA=m CONFIG_LAPB=m +CONFIG_LAPBETHER=m CONFIG_LBDAF=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_ILI9320=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 99b5aa63d14..776d89b3620 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -119,7 +119,6 @@ CONFIG_KGDB=y CONFIG_KSM=y CONFIG_KTIME_SCALAR=y CONFIG_KVM=m -CONFIG_LAPBETHER=m CONFIG_LATENCYTOP=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_PCA9532=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index fc97da2c244..f712c1ac225 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_LAPBETHER=m # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 22c7f31cd08..8032abe1c40 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -118,7 +118,6 @@ CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KGDB=y CONFIG_KSM=y CONFIG_KVM=y -CONFIG_LAPBETHER=m CONFIG_LATENCYTOP=y # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_PCA9532 is not set |