[git pull] Please pull powerpc.git merge branch

[Tabi Timur-B04825]

On Fri, May 20, 2011 at 9:35 AM, Kumar Gala <galak at kernel.crashing.org> wrote:

> Shaohui Xie (2):
>      powerpc/fsl_rio: move machine_check handler

This patch causes a build failure if CONFIG_FSL_RIO is not defined:

arch/powerpc/kernel/built-in.o: In function `machine_check_e500mc':
/home/b04825/git/linux.hv/arch/powerpc/kernel/traps.c:429: undefined
reference to `fsl_rio_mcheck_exception'
arch/powerpc/kernel/built-in.o: In function `machine_check_e500':
/home/b04825/git/linux.hv/arch/powerpc/kernel/traps.c:519: undefined
reference to `fsl_rio_mcheck_exception'

-- 
Timur Tabi
Linux kernel developer at Freescale