From 6a2e57ac4c3257fafdef6e25a7974c6e69a2f343 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 5 Mar 2009 17:37:11 +0000 Subject: [PATCH] --- yaml --- r: 138533 b: refs/heads/master c: 47c3c6ef955aabdccce294eb61c3294c8083478f h: refs/heads/master i: 138531: ef8b54afa28e29e38328eb5a3e010f4ee2dbf787 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/Kconfig | 5 +++++ trunk/arch/powerpc/platforms/cell/Makefile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc4a5e98b1f8..d6551b2eca1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bac0221554d2e9153e6aff2272ee833b5bff980 +refs/heads/master: 47c3c6ef955aabdccce294eb61c3294c8083478f diff --git a/trunk/arch/powerpc/platforms/cell/Kconfig b/trunk/arch/powerpc/platforms/cell/Kconfig index 037f59a4bfe7..17b9b193557c 100644 --- a/trunk/arch/powerpc/platforms/cell/Kconfig +++ b/trunk/arch/powerpc/platforms/cell/Kconfig @@ -43,6 +43,11 @@ config PPC_CELL_QPACE depends on PPC_MULTIPLATFORM && PPC64 select PPC_CELL_COMMON +config AXON_MSI + bool + depends on PPC_IBM_CELL_BLADE && PCI_MSI + default y + menu "Cell Broadband Engine options" depends on PPC_CELL diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/arch/powerpc/platforms/cell/Makefile index 43eccb270301..83fafe922641 100644 --- a/trunk/arch/powerpc/platforms/cell/Makefile +++ b/trunk/arch/powerpc/platforms/cell/Makefile @@ -28,7 +28,7 @@ obj-$(CONFIG_SPU_BASE) += spu_callbacks.o spu_base.o \ $(spu-manage-y) \ spufs/ -obj-$(CONFIG_PCI_MSI) += axon_msi.o +obj-$(CONFIG_AXON_MSI) += axon_msi.o # qpace setup obj-$(CONFIG_PPC_CELL_QPACE) += qpace_setup.o