From b0f55e28da7a74b827fd737c3ed0678170f48c53 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 7 Jun 2012 08:58:24 +0100 Subject: [PATCH 09/34] UBUNTU: [Config] highbank -- commonise CONFIG_CRYPTO_LZO Signed-off-by: Andy Whitcroft --- 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, 8 insertions(+), 8 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index bd836fe..2759e0b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -77,7 +77,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAB=y @@ -304,6 +303,7 @@ CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y # CONFIG_M686 is not set CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 3249358..812678f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -73,7 +73,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y @@ -292,6 +291,7 @@ CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 1421311..f5a1248 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -60,7 +60,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CRC7 is not set # CONFIG_CRC8 is not set # CONFIG_CRC_T10DIF is not set -CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_RNG=m # CONFIG_CUSE is not set CONFIG_DAVICOM_PHY=m @@ -237,6 +236,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LOGIWHEELS_FF is not set CONFIG_LSI_ET1011C_PHY=m CONFIG_LXT_PHY=m +CONFIG_LZO_COMPRESS=m # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_HWSIM is not set # CONFIG_MAC80211_MESH is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index aa22432..1a25ac0 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -60,7 +60,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y @@ -237,6 +236,7 @@ CONFIG_LOGITECH_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d121009..8340959 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1048,6 +1048,7 @@ CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -2713,7 +2714,6 @@ CONFIG_LPC_SCH=m CONFIG_LRU_CACHE=m CONFIG_LSM_MMAP_MIN_ADDR=0 CONFIG_LTPC=m -CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_M25PXX_USE_FAST_READ=y # CONFIG_M386 is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d1a5340..1903318 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -75,7 +75,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAB=y @@ -304,6 +303,7 @@ CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y CONFIG_M686=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 70dd9b0..3d1ac7c 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -69,7 +69,6 @@ CONFIG_CPU_FREQ_STAT=m CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m # CONFIG_DAB is not set @@ -293,6 +292,7 @@ CONFIG_LOG_BUF_SHIFT=17 # CONFIG_LPARCFG is not set CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 5b0f984..f03b924 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -74,7 +74,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m # CONFIG_DAB is not set @@ -306,6 +305,7 @@ CONFIG_LOG_BUF_SHIFT=19 CONFIG_LPARCFG=y CONFIG_LSI_ET1011C_PHY=y CONFIG_LXT_PHY=y +CONFIG_LZO_COMPRESS=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -- 1.7.9.5