diff --git a/[refs] b/[refs] index 1deed7bd24bd..19f6c2eaf45a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c21e783bafdd3d45b6aaa81a842ef29777c22326 +refs/heads/master: 3d6ba60892daf93e2cfdcc20a3d9e83ddf501979 diff --git a/trunk/arch/blackfin/configs/BF609-EZKIT_defconfig b/trunk/arch/blackfin/configs/BF609-EZKIT_defconfig index be9526bee4fb..f4b02350e415 100644 --- a/trunk/arch/blackfin/configs/BF609-EZKIT_defconfig +++ b/trunk/arch/blackfin/configs/BF609-EZKIT_defconfig @@ -90,6 +90,7 @@ CONFIG_INPUT_BFIN_ROTARY=y # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set CONFIG_BFIN_SIMPLE_TIMER=m +# CONFIG_BFIN_CRC is not set CONFIG_BFIN_LINKPORT=y # CONFIG_DEVKMEM is not set CONFIG_SERIAL_BFIN=y @@ -153,3 +154,4 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_BFIN_CRC=y