diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
| commit | cf66c897d7fa07f57452b1a369aec37d97b11e31 (patch) | |
| tree | eb74b71c2ff288f4d77423bb7e54c3c55ef08bf9 /arch/ppc/Makefile | |
| parent | facee873de8da5fe709c194f98eb0f2cc642a38c (diff) | |
| parent | 78af90629ce98c8383ea16928e110eb97b889be6 (diff) | |
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/ \ | |||
| 67 | core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ | 67 | core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ |
| 68 | core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ | 68 | core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ |
| 69 | core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ | 69 | core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ |
| 70 | core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ | 70 | core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ |
| 71 | core-$(CONFIG_XMON) += arch/ppc/xmon/ | 71 | core-$(CONFIG_XMON) += arch/ppc/xmon/ |
| 72 | core-$(CONFIG_APUS) += arch/ppc/amiga/ | 72 | core-$(CONFIG_APUS) += arch/ppc/amiga/ |
| 73 | drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ | 73 | drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ |