History

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/p1023rds: Fix the error of bank-width of nor flash powerpc/85xx: enable caam crypto driver by default powerpc/85xx: enable the audio drivers in the defconfigs

Linus Torvalds committed 15 years ago

Commit e9208a42 parents 9e79e3e 0c81e4b6 files · +9 −2Browse files

Unified · Split

6 files
  1. arch/powerpc/boot/dts/p1023rds.dts +1 −1
  2. arch/powerpc/configs/85xx/p1023rds_defconfig +1 −0
  3. arch/powerpc/configs/corenet32_smp_defconfig +1 −0
  4. arch/powerpc/configs/corenet64_smp_defconfig +4 −1
  5. arch/powerpc/configs/mpc85xx_defconfig +1 −0
  6. arch/powerpc/configs/mpc85xx_smp_defconfig +1 −0
arch/powerpc/boot/dts/p1023rds.dts+1−1
@@ -387,7 +387,7 @@ · 386 unmodified lines
387 #size-cells = <1>;387 #size-cells = <1>;
388 compatible = "cfi-flash";388 compatible = "cfi-flash";
389 reg = <0x0 0x0 0x02000000>;389 reg = <0x0 0x0 0x02000000>;
390 bank-width = <1>;390 bank-width = <2>;
391 device-width = <1>;391 device-width = <1>;
392 partition@0 {392 partition@0 {
393 label = "ramdisk";393 label = "ramdisk";
arch/powerpc/configs/85xx/p1023rds_defconfig+1−0
@@ -171,3 +171,4 @@ CONFIG_CRYPTO_SHA256=y · 170 unmodified lines
171CONFIG_CRYPTO_SHA512=y171CONFIG_CRYPTO_SHA512=y
172CONFIG_CRYPTO_AES=y172CONFIG_CRYPTO_AES=y
173# CONFIG_CRYPTO_ANSI_CPRNG is not set173# CONFIG_CRYPTO_ANSI_CPRNG is not set
174CONFIG_CRYPTO_DEV_FSL_CAAM=y
arch/powerpc/configs/corenet32_smp_defconfig+1−0
@@ -185,3 +185,4 @@ CONFIG_CRYPTO_SHA256=y · 184 unmodified lines
185CONFIG_CRYPTO_SHA512=y185CONFIG_CRYPTO_SHA512=y
186CONFIG_CRYPTO_AES=y186CONFIG_CRYPTO_AES=y
187# CONFIG_CRYPTO_ANSI_CPRNG is not set187# CONFIG_CRYPTO_ANSI_CPRNG is not set
188CONFIG_CRYPTO_DEV_FSL_CAAM=y
arch/powerpc/configs/corenet64_smp_defconfig+4−1
@@ -100,5 +100,8 @@ CONFIG_DEBUG_INFO=y · 99 unmodified lines
100CONFIG_SYSCTL_SYSCALL_CHECK=y100CONFIG_SYSCTL_SYSCALL_CHECK=y
101CONFIG_VIRQ_DEBUG=y101CONFIG_VIRQ_DEBUG=y
102CONFIG_CRYPTO_PCBC=m102CONFIG_CRYPTO_PCBC=m
103CONFIG_CRYPTO_SHA256=y
104CONFIG_CRYPTO_SHA512=y
105CONFIG_CRYPTO_AES=y
103# CONFIG_CRYPTO_ANSI_CPRNG is not set106# CONFIG_CRYPTO_ANSI_CPRNG is not set
104CONFIG_CRYPTO_DEV_TALITOS=y107CONFIG_CRYPTO_DEV_FSL_CAAM=y
arch/powerpc/configs/mpc85xx_defconfig+1−0
@@ -139,6 +139,7 @@ CONFIG_SND=y · 138 unmodified lines
139CONFIG_SND_INTEL8X0=y139CONFIG_SND_INTEL8X0=y
140# CONFIG_SND_PPC is not set140# CONFIG_SND_PPC is not set
141# CONFIG_SND_USB is not set141# CONFIG_SND_USB is not set
142CONFIG_SND_SOC=y
142CONFIG_HID_A4TECH=y143CONFIG_HID_A4TECH=y
143CONFIG_HID_APPLE=y144CONFIG_HID_APPLE=y
144CONFIG_HID_BELKIN=y145CONFIG_HID_BELKIN=y
arch/powerpc/configs/mpc85xx_smp_defconfig+1−0
@@ -140,6 +140,7 @@ CONFIG_SND=y · 139 unmodified lines
140CONFIG_SND_INTEL8X0=y140CONFIG_SND_INTEL8X0=y
141# CONFIG_SND_PPC is not set141# CONFIG_SND_PPC is not set
142# CONFIG_SND_USB is not set142# CONFIG_SND_USB is not set
143CONFIG_SND_SOC=y
143CONFIG_HID_A4TECH=y144CONFIG_HID_A4TECH=y
144CONFIG_HID_APPLE=y145CONFIG_HID_APPLE=y
145CONFIG_HID_BELKIN=y146CONFIG_HID_BELKIN=y

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t