[PATCH] UBUNTU: [config] Enable CONFIG_ALX module on i386 and amd64 only

Luis Henriques luis.henriques at canonical.com
Wed Feb 6 14:57:33 UTC 2013


Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 +
 debian.master/config/config.common.ubuntu      | 2 +-
 debian.master/config/i386/config.common.i386   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index db194af..49a97c8 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -6,6 +6,7 @@ CONFIG_ABX500_CORE=y
 CONFIG_ACORN_PARTITION=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
+CONFIG_ALX=m
 CONFIG_AMIGA_PARTITION=y
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3dd2c9a..75efe2e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -190,7 +190,7 @@ CONFIG_ALIX=y
 CONFIG_ALI_FIR=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTIVEC=y
-CONFIG_ALX=m
+# CONFIG_ALX is not set
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_STATS=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d1bb7fd..d5838c8 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -6,6 +6,7 @@ CONFIG_ABX500_CORE=y
 CONFIG_ACORN_PARTITION=y
 CONFIG_ACPI_BLACKLIST_YEAR=2000
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
+CONFIG_ALX=m
 CONFIG_AMIGA_PARTITION=y
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-- 
1.8.1.2





More information about the kernel-team mailing list