diff options
| author | Benjamin Herrenschmidt | 2012-05-10 04:58:24 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2012-05-10 04:58:24 +0200 |
| commit | b48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (patch) | |
| tree | 09faed1b557b70f439064d3baaefef91e0ee7334 /arch/powerpc/platforms | |
| parent | powerpc: Remove now unused _TIF_RUNLATCH (diff) | |
| parent | powerpc/40x: Use {upper,lower}_32_bits for msi_phys (diff) | |
| download | kernel-qcow2-linux-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.tar.gz kernel-qcow2-linux-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.tar.xz kernel-qcow2-linux-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.zip | |
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 default n select PPC44x_SIMPLE select APM821xx + select PCI_MSI + select PPC4xx_MSI select PPC4xx_PCI_EXPRESS select IBM_EMAC_RGMII help |