diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 03:56:04 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 03:56:04 +0400 |
| commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
| tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/sysdev/Makefile | |
| parent | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (diff) | |
| parent | e96dde2b5edbc0d385ccced05fb5db68c070b0d4 (diff) | |
| download | linux-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.tar.xz | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 5e37b4717864..1bd7ecb24620 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -4,6 +4,8 @@ ccflags-$(CONFIG_PPC64) := -mno-minimal-toc mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y) +mpic-msgr-obj-$(CONFIG_MPIC_MSGR) += mpic_msgr.o +obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y) $(mpic-msgr-obj-y) obj-$(CONFIG_PPC_EPAPR_HV_PIC) += ehv_pic.o fsl-msi-obj-$(CONFIG_PCI_MSI) += fsl_msi.o obj-$(CONFIG_PPC_MSI_BITMAP) += msi_bitmap.o @@ -65,3 +67,5 @@ obj-$(CONFIG_PPC_SCOM) += scom.o subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror obj-$(CONFIG_PPC_XICS) += xics/ + +obj-$(CONFIG_GE_FPGA) += ge/ |