diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 22:58:24 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 22:58:24 -0400 |
| commit | b48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (patch) | |
| tree | 09faed1b557b70f439064d3baaefef91e0ee7334 /arch/powerpc/platforms | |
| parent | a7243c1d09ade57d8d48a350753dc2d1af735805 (diff) | |
| parent | dce4c92d69db53ed0e09191428f17ac9a14ad248 (diff) | |
Merge remote-tracking branch 'jwb/next' into next
Josh writes:
<<
A few patches from Suzie for 47x kexec/kdump support, and some MSI patches
from Mai La.
>>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 2e4e64abfab4..8abf6fb8f410 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
| @@ -23,6 +23,8 @@ config BLUESTONE | |||
| 23 | default n | 23 | default n |
| 24 | select PPC44x_SIMPLE | 24 | select PPC44x_SIMPLE |
| 25 | select APM821xx | 25 | select APM821xx |
| 26 | select PCI_MSI | ||
| 27 | select PPC4xx_MSI | ||
| 26 | select PPC4xx_PCI_EXPRESS | 28 | select PPC4xx_PCI_EXPRESS |
| 27 | select IBM_EMAC_RGMII | 29 | select IBM_EMAC_RGMII |
| 28 | help | 30 | help |