diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 07:56:11 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 07:56:11 +0200 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/powerpc/platforms/Makefile | |
| parent | [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 (diff) | |
| parent | Linux 2.6.23-rc4 (diff) | |
| download | linux-35438c4327df18dbf5e7f597b69299119f4a14de.tar.xz linux-35438c4327df18dbf5e7f597b69299119f4a14de.zip | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/platforms/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index d6e041a46d25..d44e832b01f2 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile @@ -1,3 +1,6 @@ + +obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o + ifeq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_PPC_PMAC) += powermac/ else |