diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:00 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:00 +1100 |
| commit | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (patch) | |
| tree | ee8e45580ae0304a3f22c715c0b88b870b5774b3 /arch/powerpc/platforms | |
| parent | ff651516683421d773802707652207d4036244cc (diff) | |
| parent | b5594a7760fa048730db64c501cf4534df06b3b3 (diff) | |
| download | linux-stable-2d87e06e7477fa1467e730087b68c2f518c0fff6.tar.gz linux-stable-2d87e06e7477fa1467e730087b68c2f518c0fff6.tar.bz2 linux-stable-2d87e06e7477fa1467e730087b68c2f518c0fff6.zip | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index fcf6bf2ceee9..2e4e64abfab4 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -23,6 +23,7 @@ config BLUESTONE default n select PPC44x_SIMPLE select APM821xx + select PPC4xx_PCI_EXPRESS select IBM_EMAC_RGMII help This option enables support for the APM APM821xx Evaluation board. diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index 8d2202763415..3ffb915446e3 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -52,7 +52,7 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe); static char *board[] __initdata = { "amcc,arches", "amcc,bamboo", - "amcc,bluestone", + "apm,bluestone", "amcc,glacier", "ibm,ebony", "amcc,eiger", |