[PATCH 4/4] UBUNTU: [Config] updateconfigs for ppc43el and powerpc

[Tim Gardner]

BugLink: http://bugs.launchpad.net/bugs/1670247

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/powerpc/config.flavour.generic        | 1 -
 debian.master/config/powerpc/config.flavour.powerpc-e500mc | 1 -
 debian.master/config/powerpc/config.flavour.powerpc-smp    | 1 -
 debian.master/config/powerpc/config.flavour.powerpc64-emb  | 1 -
 debian.master/config/ppc64el/config.common.ppc64el         | 3 +--
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index 43957c7..082fd68 100644
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -84,5 +84,4 @@ CONFIG_SCSI_SRP_ATTRS=y
 # CONFIG_TEST_PRINTF is not set
 CONFIG_U3_DART=y
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_WORD_SIZE=64
 # CONFIG_WQ_WATCHDOG is not set
diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index 3adfe82..80f04ab 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -79,5 +79,4 @@ CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
 CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WORD_SIZE=32
 CONFIG_WQ_WATCHDOG=y
diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 581f470..c6e7d04 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -79,5 +79,4 @@ CONFIG_SCSI_SRP_ATTRS=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_WORD_SIZE=32
 # CONFIG_WQ_WATCHDOG is not set
diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index 23d7c2b..e20ea08 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -84,5 +84,4 @@ CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_U3_DART is not set
 CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WORD_SIZE=64
 CONFIG_WQ_WATCHDOG=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 159a95c..7db77e1 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -169,7 +169,7 @@ CONFIG_FUSE_FS=y
 CONFIG_FUSION=y
 CONFIG_GAMEPORT=m
 CONFIG_GDB_SCRIPTS=y
-CONFIG_GENERIC_CSUM=y
+# CONFIG_GENERIC_CSUM is not set
 CONFIG_GENERIC_PHY=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_GPIOLIB=y
@@ -703,7 +703,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_WORD_SIZE=64
 # CONFIG_WQ_WATCHDOG is not set
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_STATISTICS=y
-- 
2.7.4