From 8eaecb7e7f221d7cf6a2e6c579bb102fdfa2f186 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Thu, 7 Jun 2012 11:51:26 +0100
Subject: [PATCH 16/34] UBUNTU: [Config] highbank -- commonise CRC settings

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    2 --
 debian.master/config/armel/config.common.armel     |    2 --
 debian.master/config/armhf/config.flavour.highbank |    2 --
 debian.master/config/armhf/config.flavour.omap     |    2 --
 debian.master/config/config.common.ubuntu          |    2 ++
 debian.master/config/i386/config.common.i386       |    2 --
 debian.master/config/powerpc/config.common.powerpc |    2 --
 debian.master/config/ppc64/config.common.ppc64     |    2 --
 8 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ce817a4..0b555d5 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -60,8 +60,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 CONFIG_DAB=y
 CONFIG_DE600=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 7c548c5..d4cb71c 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -56,8 +56,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 16269aa..593359b 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -43,8 +43,6 @@ CONFIG_CONNECTOR=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC7 is not set
-# CONFIG_CRC8 is not set
 # CONFIG_CUSE is not set
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index a2c083e..5b05652 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -43,8 +43,6 @@ CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 292549d..b124e18 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1009,6 +1009,8 @@ CONFIG_CPU_V7=y
 CONFIG_CRAMFS=m
 CONFIG_CRC16=y
 CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 51ead9a..c7ec730 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -58,8 +58,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 CONFIG_DAB=y
 CONFIG_DE600=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 6f88be6..55528f9 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -52,8 +52,6 @@ CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 # CONFIG_DAB is not set
 CONFIG_DE600=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 8095665..7481711 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -57,8 +57,6 @@ CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 # CONFIG_DAB is not set
 CONFIG_DE600=m
-- 
1.7.9.5

