aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-09 15:22:16 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-19 00:03:14 -0700
commitece5854d38e2d8c293fcb04c2cd1171bf4544325 (patch)
treef5a47cc4043653f87c914ee984e701b661abead4
parent3d62c69f4791751408a98c98035f72f9870ea912 (diff)
UBUNTU: [Config] Temporarily disable CONFIG_STMMAC_ETH on armhf
Build failure: ERROR: "clk_enable" [drivers/net/ethernet/stmicro/stmmac/stmmac.ko] undefined! ERROR: "clk_disable" [drivers/net/ethernet/stmicro/stmmac/stmmac.ko] undefined! ERROR: "clk_get_rate" [drivers/net/ethernet/stmicro/stmmac/stmmac.ko] undefined! Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-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/armhf/config.common.armhf1
-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
7 files changed, 6 insertions, 1 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 2cdbc5ddd6f..cdc1a1323be 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -252,6 +252,7 @@ CONFIG_SQUASHFS_XZ=y
CONFIG_STACK_TRACER=y
CONFIG_STAGING_MEDIA=y
# CONFIG_STANDALONE is not set
+CONFIG_STMMAC_ETH=m
CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 2a489987491..372a34872fb 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -256,6 +256,7 @@ CONFIG_SQUASHFS_XZ=y
# CONFIG_STACK_TRACER is not set
CONFIG_STAGING_MEDIA=y
CONFIG_STANDALONE=y
+CONFIG_STMMAC_ETH=m
CONFIG_SUN_PARTITION=y
# CONFIG_SWP_EMULATE is not set
CONFIG_SYSCTL_SYSCALL=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 34b35ae54c5..af4ca3caa84 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -85,6 +85,7 @@ CONFIG_SCSI_SPI_ATTRS=m
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_STACK_TRACER is not set
CONFIG_STANDALONE=y
+# CONFIG_STMMAC_ETH is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 452a59965ba..c537b279c45 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5409,7 +5409,6 @@ CONFIG_STE10XP=y
# CONFIG_STMMAC_CHAINED is not set
# CONFIG_STMMAC_DA is not set
# CONFIG_STMMAC_DEBUG_FS is not set
-CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
CONFIG_STMMAC_RING=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 83b47851770..67b1b51307d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -251,6 +251,7 @@ CONFIG_SQUASHFS_XZ=y
CONFIG_STACK_TRACER=y
CONFIG_STAGING_MEDIA=y
# CONFIG_STANDALONE is not set
+CONFIG_STMMAC_ETH=m
CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9f24285ff25..52b237ef9c2 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -242,6 +242,7 @@ CONFIG_SQUASHFS_XZ=y
# CONFIG_STACK_TRACER is not set
CONFIG_STAGING_MEDIA=y
CONFIG_STANDALONE=y
+CONFIG_STMMAC_ETH=m
CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index d46d9e5a4cf..250dcea92d1 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -277,6 +277,7 @@ CONFIG_SSB_PCMCIAHOST=y
# CONFIG_STACK_TRACER is not set
CONFIG_STAGING_MEDIA=y
CONFIG_STANDALONE=y
+CONFIG_STMMAC_ETH=m
CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y