diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-11 00:31:42 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-11 00:31:42 -0500 |
| commit | 973c1fabc70deb10f12a0eaab2f50c2263784257 (patch) | |
| tree | 5b0ef183757049d241d0709f0cea9e370627b687 /arch/powerpc/sysdev | |
| parent | 4383162c8f2fa75d916c4901b0d1ebcac7aeaf74 (diff) | |
| parent | d10f73480b991da2aa1c000ed38eda3e4a987292 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 6cc34597a620..04d4917eb303 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
| @@ -5,7 +5,8 @@ endif | |||
| 5 | obj-$(CONFIG_MPIC) += mpic.o | 5 | obj-$(CONFIG_MPIC) += mpic.o |
| 6 | obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o | 6 | obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o |
| 7 | obj-$(CONFIG_PPC_MPC106) += grackle.o | 7 | obj-$(CONFIG_PPC_MPC106) += grackle.o |
| 8 | obj-$(CONFIG_PPC_DCR) += dcr.o dcr-low.o | 8 | obj-$(CONFIG_PPC_DCR) += dcr.o |
| 9 | obj-$(CONFIG_PPC_DCR_NATIVE) += dcr-low.o | ||
| 9 | obj-$(CONFIG_U3_DART) += dart_iommu.o | 10 | obj-$(CONFIG_U3_DART) += dart_iommu.o |
| 10 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o | 11 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o |
| 11 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o | 12 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o |