diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 13:28:19 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:57:58 -0600 |
| commit | 238eebf15a0951af0fc445689019525ea18cc60c (patch) | |
| tree | 575c7747a70d4d4ee779f31cef07ef2ada2b5a99 /debian.master | |
| parent | ba85f777a4779bdaee15b1582d056daf295e7f7b (diff) | |
UBUNTU: [Config] Enable CONFIG_IWL3945=m on powerpc
Per the non-modular module review, eanble CONFIG_IWL3945=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 5241c55082c..50ddd3676d1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -114,7 +114,6 @@ CONFIG_INTEL_TXT=y CONFIG_INTR_REMAP=y CONFIG_IOMMU_HELPER=y # CONFIG_IRQ_PER_CPU is not set -CONFIG_IWL3945=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KGDB=y CONFIG_KSM=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e082a49add4..467b65cb81e 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -103,7 +103,6 @@ CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set # CONFIG_INTR_REMAP is not set # CONFIG_IRQ_PER_CPU is not set -CONFIG_IWL3945=m # CONFIG_IWMC3200TOP_DEBUGFS is not set CONFIG_KGDB=y # CONFIG_KSM is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bb057f0fae5..e78d87d7fbd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2511,6 +2511,7 @@ CONFIG_IT8712F_WDT=m CONFIG_IT87_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_ITCO_WDT=m +CONFIG_IWL3945=m CONFIG_IWL4965=m CONFIG_IWLAGN=m # CONFIG_IWLWIFI_DEBUG is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 005353f5948..99b5aa63d14 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -114,7 +114,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0 # CONFIG_INTR_REMAP is not set # CONFIG_IRQ_PER_CPU is not set CONFIG_ISA=y -CONFIG_IWL3945=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KGDB=y CONFIG_KSM=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 16feaf6f8bf..e99f73cd08b 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -101,7 +101,6 @@ CONFIG_IOMMU_HELPER=y # CONFIG_IRQ_ALL_CPUS is not set CONFIG_IRQ_PER_CPU=y # CONFIG_ISA is not set -# CONFIG_IWL3945 is not set CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KSM=y CONFIG_KVM=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 779831ff9d8..9b0247743c5 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -113,7 +113,6 @@ CONFIG_IDE=y CONFIG_IOMMU_HELPER=y CONFIG_IRQ_ALL_CPUS=y CONFIG_IRQ_PER_CPU=y -# CONFIG_IWL3945 is not set CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KGDB=y |