diff options
| -rw-r--r-- | arch/powerpc/configs/mpc83xx_defconfig | 15 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 16 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 16 |
3 files changed, 24 insertions, 23 deletions
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 4a96cb6925b4..d6d28f2a23c1 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -343,7 +343,8 @@ CONFIG_XFRM_USER=m | |||
| 343 | # CONFIG_XFRM_SUB_POLICY is not set | 343 | # CONFIG_XFRM_SUB_POLICY is not set |
| 344 | # CONFIG_XFRM_MIGRATE is not set | 344 | # CONFIG_XFRM_MIGRATE is not set |
| 345 | # CONFIG_XFRM_STATISTICS is not set | 345 | # CONFIG_XFRM_STATISTICS is not set |
| 346 | # CONFIG_NET_KEY is not set | 346 | CONFIG_NET_KEY=y |
| 347 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 347 | CONFIG_INET=y | 348 | CONFIG_INET=y |
| 348 | CONFIG_IP_MULTICAST=y | 349 | CONFIG_IP_MULTICAST=y |
| 349 | # CONFIG_IP_ADVANCED_ROUTER is not set | 350 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| @@ -358,7 +359,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 358 | # CONFIG_ARPD is not set | 359 | # CONFIG_ARPD is not set |
| 359 | CONFIG_SYN_COOKIES=y | 360 | CONFIG_SYN_COOKIES=y |
| 360 | # CONFIG_INET_AH is not set | 361 | # CONFIG_INET_AH is not set |
| 361 | # CONFIG_INET_ESP is not set | 362 | CONFIG_INET_ESP=y |
| 362 | # CONFIG_INET_IPCOMP is not set | 363 | # CONFIG_INET_IPCOMP is not set |
| 363 | # CONFIG_INET_XFRM_TUNNEL is not set | 364 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 364 | # CONFIG_INET_TUNNEL is not set | 365 | # CONFIG_INET_TUNNEL is not set |
| @@ -1591,7 +1592,7 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1591 | # | 1592 | # |
| 1592 | # Hash modes | 1593 | # Hash modes |
| 1593 | # | 1594 | # |
| 1594 | # CONFIG_CRYPTO_HMAC is not set | 1595 | CONFIG_CRYPTO_HMAC=y |
| 1595 | # CONFIG_CRYPTO_XCBC is not set | 1596 | # CONFIG_CRYPTO_XCBC is not set |
| 1596 | 1597 | ||
| 1597 | # | 1598 | # |
| @@ -1605,16 +1606,16 @@ CONFIG_CRYPTO_MD5=y | |||
| 1605 | # CONFIG_CRYPTO_RMD160 is not set | 1606 | # CONFIG_CRYPTO_RMD160 is not set |
| 1606 | # CONFIG_CRYPTO_RMD256 is not set | 1607 | # CONFIG_CRYPTO_RMD256 is not set |
| 1607 | # CONFIG_CRYPTO_RMD320 is not set | 1608 | # CONFIG_CRYPTO_RMD320 is not set |
| 1608 | # CONFIG_CRYPTO_SHA1 is not set | 1609 | CONFIG_CRYPTO_SHA1=y |
| 1609 | # CONFIG_CRYPTO_SHA256 is not set | 1610 | CONFIG_CRYPTO_SHA256=y |
| 1610 | # CONFIG_CRYPTO_SHA512 is not set | 1611 | CONFIG_CRYPTO_SHA512=y |
| 1611 | # CONFIG_CRYPTO_TGR192 is not set | 1612 | # CONFIG_CRYPTO_TGR192 is not set |
| 1612 | # CONFIG_CRYPTO_WP512 is not set | 1613 | # CONFIG_CRYPTO_WP512 is not set |
| 1613 | 1614 | ||
| 1614 | # | 1615 | # |
| 1615 | # Ciphers | 1616 | # Ciphers |
| 1616 | # | 1617 | # |
| 1617 | # CONFIG_CRYPTO_AES is not set | 1618 | CONFIG_CRYPTO_AES=y |
| 1618 | # CONFIG_CRYPTO_ANUBIS is not set | 1619 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1619 | # CONFIG_CRYPTO_ARC4 is not set | 1620 | # CONFIG_CRYPTO_ARC4 is not set |
| 1620 | # CONFIG_CRYPTO_BLOWFISH is not set | 1621 | # CONFIG_CRYPTO_BLOWFISH is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index ee6acc6557f8..70851ee74340 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -345,7 +345,7 @@ CONFIG_XFRM_USER=y | |||
| 345 | # CONFIG_XFRM_SUB_POLICY is not set | 345 | # CONFIG_XFRM_SUB_POLICY is not set |
| 346 | # CONFIG_XFRM_MIGRATE is not set | 346 | # CONFIG_XFRM_MIGRATE is not set |
| 347 | # CONFIG_XFRM_STATISTICS is not set | 347 | # CONFIG_XFRM_STATISTICS is not set |
| 348 | CONFIG_NET_KEY=m | 348 | CONFIG_NET_KEY=y |
| 349 | # CONFIG_NET_KEY_MIGRATE is not set | 349 | # CONFIG_NET_KEY_MIGRATE is not set |
| 350 | CONFIG_INET=y | 350 | CONFIG_INET=y |
| 351 | CONFIG_IP_MULTICAST=y | 351 | CONFIG_IP_MULTICAST=y |
| @@ -369,12 +369,12 @@ CONFIG_IP_PIMSM_V2=y | |||
| 369 | CONFIG_ARPD=y | 369 | CONFIG_ARPD=y |
| 370 | # CONFIG_SYN_COOKIES is not set | 370 | # CONFIG_SYN_COOKIES is not set |
| 371 | # CONFIG_INET_AH is not set | 371 | # CONFIG_INET_AH is not set |
| 372 | # CONFIG_INET_ESP is not set | 372 | CONFIG_INET_ESP=y |
| 373 | # CONFIG_INET_IPCOMP is not set | 373 | # CONFIG_INET_IPCOMP is not set |
| 374 | # CONFIG_INET_XFRM_TUNNEL is not set | 374 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 375 | CONFIG_INET_TUNNEL=y | 375 | CONFIG_INET_TUNNEL=y |
| 376 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 376 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 377 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 377 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 378 | # CONFIG_INET_XFRM_MODE_BEET is not set | 378 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 379 | # CONFIG_INET_LRO is not set | 379 | # CONFIG_INET_LRO is not set |
| 380 | CONFIG_INET_DIAG=y | 380 | CONFIG_INET_DIAG=y |
| @@ -1769,16 +1769,16 @@ CONFIG_CRYPTO_MD5=y | |||
| 1769 | # CONFIG_CRYPTO_RMD160 is not set | 1769 | # CONFIG_CRYPTO_RMD160 is not set |
| 1770 | # CONFIG_CRYPTO_RMD256 is not set | 1770 | # CONFIG_CRYPTO_RMD256 is not set |
| 1771 | # CONFIG_CRYPTO_RMD320 is not set | 1771 | # CONFIG_CRYPTO_RMD320 is not set |
| 1772 | CONFIG_CRYPTO_SHA1=m | 1772 | CONFIG_CRYPTO_SHA1=y |
| 1773 | # CONFIG_CRYPTO_SHA256 is not set | 1773 | CONFIG_CRYPTO_SHA256=y |
| 1774 | # CONFIG_CRYPTO_SHA512 is not set | 1774 | CONFIG_CRYPTO_SHA512=y |
| 1775 | # CONFIG_CRYPTO_TGR192 is not set | 1775 | # CONFIG_CRYPTO_TGR192 is not set |
| 1776 | # CONFIG_CRYPTO_WP512 is not set | 1776 | # CONFIG_CRYPTO_WP512 is not set |
| 1777 | 1777 | ||
| 1778 | # | 1778 | # |
| 1779 | # Ciphers | 1779 | # Ciphers |
| 1780 | # | 1780 | # |
| 1781 | # CONFIG_CRYPTO_AES is not set | 1781 | CONFIG_CRYPTO_AES=y |
| 1782 | # CONFIG_CRYPTO_ANUBIS is not set | 1782 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1783 | # CONFIG_CRYPTO_ARC4 is not set | 1783 | # CONFIG_CRYPTO_ARC4 is not set |
| 1784 | # CONFIG_CRYPTO_BLOWFISH is not set | 1784 | # CONFIG_CRYPTO_BLOWFISH is not set |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index db082ce5a1c5..ab45fd99afc3 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
| @@ -348,7 +348,7 @@ CONFIG_XFRM_USER=y | |||
| 348 | # CONFIG_XFRM_SUB_POLICY is not set | 348 | # CONFIG_XFRM_SUB_POLICY is not set |
| 349 | # CONFIG_XFRM_MIGRATE is not set | 349 | # CONFIG_XFRM_MIGRATE is not set |
| 350 | # CONFIG_XFRM_STATISTICS is not set | 350 | # CONFIG_XFRM_STATISTICS is not set |
| 351 | CONFIG_NET_KEY=m | 351 | CONFIG_NET_KEY=y |
| 352 | # CONFIG_NET_KEY_MIGRATE is not set | 352 | # CONFIG_NET_KEY_MIGRATE is not set |
| 353 | CONFIG_INET=y | 353 | CONFIG_INET=y |
| 354 | CONFIG_IP_MULTICAST=y | 354 | CONFIG_IP_MULTICAST=y |
| @@ -372,12 +372,12 @@ CONFIG_IP_PIMSM_V2=y | |||
| 372 | CONFIG_ARPD=y | 372 | CONFIG_ARPD=y |
| 373 | # CONFIG_SYN_COOKIES is not set | 373 | # CONFIG_SYN_COOKIES is not set |
| 374 | # CONFIG_INET_AH is not set | 374 | # CONFIG_INET_AH is not set |
| 375 | # CONFIG_INET_ESP is not set | 375 | CONFIG_INET_ESP=y |
| 376 | # CONFIG_INET_IPCOMP is not set | 376 | # CONFIG_INET_IPCOMP is not set |
| 377 | # CONFIG_INET_XFRM_TUNNEL is not set | 377 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 378 | CONFIG_INET_TUNNEL=y | 378 | CONFIG_INET_TUNNEL=y |
| 379 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 379 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 380 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 380 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 381 | # CONFIG_INET_XFRM_MODE_BEET is not set | 381 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 382 | # CONFIG_INET_LRO is not set | 382 | # CONFIG_INET_LRO is not set |
| 383 | CONFIG_INET_DIAG=y | 383 | CONFIG_INET_DIAG=y |
| @@ -1772,16 +1772,16 @@ CONFIG_CRYPTO_MD5=y | |||
| 1772 | # CONFIG_CRYPTO_RMD160 is not set | 1772 | # CONFIG_CRYPTO_RMD160 is not set |
| 1773 | # CONFIG_CRYPTO_RMD256 is not set | 1773 | # CONFIG_CRYPTO_RMD256 is not set |
| 1774 | # CONFIG_CRYPTO_RMD320 is not set | 1774 | # CONFIG_CRYPTO_RMD320 is not set |
| 1775 | CONFIG_CRYPTO_SHA1=m | 1775 | CONFIG_CRYPTO_SHA1=y |
| 1776 | # CONFIG_CRYPTO_SHA256 is not set | 1776 | CONFIG_CRYPTO_SHA256=y |
| 1777 | # CONFIG_CRYPTO_SHA512 is not set | 1777 | CONFIG_CRYPTO_SHA512=y |
| 1778 | # CONFIG_CRYPTO_TGR192 is not set | 1778 | # CONFIG_CRYPTO_TGR192 is not set |
| 1779 | # CONFIG_CRYPTO_WP512 is not set | 1779 | # CONFIG_CRYPTO_WP512 is not set |
| 1780 | 1780 | ||
| 1781 | # | 1781 | # |
| 1782 | # Ciphers | 1782 | # Ciphers |
| 1783 | # | 1783 | # |
| 1784 | # CONFIG_CRYPTO_AES is not set | 1784 | CONFIG_CRYPTO_AES=y |
| 1785 | # CONFIG_CRYPTO_ANUBIS is not set | 1785 | # CONFIG_CRYPTO_ANUBIS is not set |
| 1786 | # CONFIG_CRYPTO_ARC4 is not set | 1786 | # CONFIG_CRYPTO_ARC4 is not set |
| 1787 | # CONFIG_CRYPTO_BLOWFISH is not set | 1787 | # CONFIG_CRYPTO_BLOWFISH is not set |
