diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-10 12:58:24 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-10 12:58:24 +1000 |
| commit | b48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (patch) | |
| tree | 09faed1b557b70f439064d3baaefef91e0ee7334 /arch/powerpc/platforms | |
| parent | a7243c1d09ade57d8d48a350753dc2d1af735805 (diff) | |
| parent | dce4c92d69db53ed0e09191428f17ac9a14ad248 (diff) | |
| download | kernel_goldelico_gta04-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.zip kernel_goldelico_gta04-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.tar.gz kernel_goldelico_gta04-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.tar.bz2 | |
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 2e4e64a..8abf6fb8 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 |