diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/ppc/syslib/Makefile | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/ppc/syslib/Makefile')
| -rw-r--r-- | arch/ppc/syslib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 95694159b226..543795be58c8 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
| @@ -7,6 +7,7 @@ CFLAGS_btext.o += -fPIC | |||
| 7 | 7 | ||
| 8 | wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o | 8 | wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o | ||
| 10 | obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o | 11 | obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o |
| 11 | obj-$(CONFIG_PPC_OCP) += ocp.o | 12 | obj-$(CONFIG_PPC_OCP) += ocp.o |
| 12 | obj-$(CONFIG_IBM_OCP) += ibm_ocp.o | 13 | obj-$(CONFIG_IBM_OCP) += ibm_ocp.o |