Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

diff --combined arch/ppc/Makefile
index e250f8333edf3fc214cef8985a59648b8677cdb9,87bd0638ab620c525fefd5f4faacd37050668f29..0db66dcf072378a4deacf0ea9d8d9f4cf5884d20
--- 1/arch/ppc/Makefile
--- 2/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@@ -40,8 -40,10 +40,8 @@@ ifndef CONFIG_FSL_BOOK
  CFLAGS                += -mstring
  endif
  
 -cpu-as-$(CONFIG_PPC64BRIDGE)  += -Wa,-mppc64bridge
  cpu-as-$(CONFIG_4xx)          += -Wa,-m405
  cpu-as-$(CONFIG_6xx)          += -Wa,-maltivec
 -cpu-as-$(CONFIG_POWER4)               += -Wa,-maltivec
  cpu-as-$(CONFIG_E500)         += -Wa,-me500
  cpu-as-$(CONFIG_E200)         += -Wa,-me200
  
@@@ -67,7 -69,7 +67,7 @@@ core-y                                += arch/ppc/kernel/ arch/powe
  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/