diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 08:03:19 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 08:03:19 +0200 |
commit | cf66c897d7fa07f57452b1a369aec37d97b11e31 (patch) | |
tree | eb74b71c2ff288f4d77423bb7e54c3c55ef08bf9 /arch/ppc/Makefile | |
parent | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/po... (diff) | |
parent | powerpc: remove OCP references (diff) | |
download | linux-cf66c897d7fa07f57452b1a369aec37d97b11e31.tar.xz linux-cf66c897d7fa07f57452b1a369aec37d97b11e31.zip |
Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc/Makefile')
-rw-r--r-- | arch/ppc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index e250f8333edf..0db66dcf0723 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -67,7 +67,7 @@ core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \ core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ -core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ +core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ core-$(CONFIG_XMON) += arch/ppc/xmon/ core-$(CONFIG_APUS) += arch/ppc/amiga/ drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ |