diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 23:51:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 01:52:38 -0400 |
| commit | 1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22 (patch) | |
| tree | 493477b7a19606c66de2f003bca83672f2164cad /arch/powerpc/configs | |
| parent | c26afe9e8591f306d79aab8071f1d34e4f60b700 (diff) | |
| parent | 9d037a777695993ec7437e5f451647dea7919d4c (diff) | |
Merge remote-tracking branch 'origin/master' into next
(Merge in order to get the PCIe mps/mrss code fixes)
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/85xx/p1023rds_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet32_smp_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig index 980ff8f61fd4..3ff5a81c709f 100644 --- a/arch/powerpc/configs/85xx/p1023rds_defconfig +++ b/arch/powerpc/configs/85xx/p1023rds_defconfig | |||
| @@ -171,3 +171,4 @@ CONFIG_CRYPTO_SHA256=y | |||
| 171 | CONFIG_CRYPTO_SHA512=y | 171 | CONFIG_CRYPTO_SHA512=y |
| 172 | CONFIG_CRYPTO_AES=y | 172 | CONFIG_CRYPTO_AES=y |
| 173 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 173 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 174 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 10562a5c65b9..4311d02a3bfd 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig | |||
| @@ -185,3 +185,4 @@ CONFIG_CRYPTO_SHA256=y | |||
| 185 | CONFIG_CRYPTO_SHA512=y | 185 | CONFIG_CRYPTO_SHA512=y |
| 186 | CONFIG_CRYPTO_AES=y | 186 | CONFIG_CRYPTO_AES=y |
| 187 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 187 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 188 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index d32283555b53..c92c204a204b 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig | |||
| @@ -100,5 +100,8 @@ CONFIG_DEBUG_INFO=y | |||
| 100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 100 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 101 | CONFIG_VIRQ_DEBUG=y | 101 | CONFIG_VIRQ_DEBUG=y |
| 102 | CONFIG_CRYPTO_PCBC=m | 102 | CONFIG_CRYPTO_PCBC=m |
| 103 | CONFIG_CRYPTO_SHA256=y | ||
| 104 | CONFIG_CRYPTO_SHA512=y | ||
| 105 | CONFIG_CRYPTO_AES=y | ||
| 103 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 106 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 104 | CONFIG_CRYPTO_DEV_TALITOS=y | 107 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index fcd85d2c72dc..a3467bfb7671 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -139,6 +139,7 @@ CONFIG_SND=y | |||
| 139 | CONFIG_SND_INTEL8X0=y | 139 | CONFIG_SND_INTEL8X0=y |
| 140 | # CONFIG_SND_PPC is not set | 140 | # CONFIG_SND_PPC is not set |
| 141 | # CONFIG_SND_USB is not set | 141 | # CONFIG_SND_USB is not set |
| 142 | CONFIG_SND_SOC=y | ||
| 142 | CONFIG_HID_A4TECH=y | 143 | CONFIG_HID_A4TECH=y |
| 143 | CONFIG_HID_APPLE=y | 144 | CONFIG_HID_APPLE=y |
| 144 | CONFIG_HID_BELKIN=y | 145 | CONFIG_HID_BELKIN=y |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 908c941fc24c..9693f6ed3da0 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
| @@ -140,6 +140,7 @@ CONFIG_SND=y | |||
| 140 | CONFIG_SND_INTEL8X0=y | 140 | CONFIG_SND_INTEL8X0=y |
| 141 | # CONFIG_SND_PPC is not set | 141 | # CONFIG_SND_PPC is not set |
| 142 | # CONFIG_SND_USB is not set | 142 | # CONFIG_SND_USB is not set |
| 143 | CONFIG_SND_SOC=y | ||
| 143 | CONFIG_HID_A4TECH=y | 144 | CONFIG_HID_A4TECH=y |
| 144 | CONFIG_HID_APPLE=y | 145 | CONFIG_HID_APPLE=y |
| 145 | CONFIG_HID_BELKIN=y | 146 | CONFIG_HID_BELKIN=y |