[PATCH] powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

Kumar Gala galak at kernel.crashing.org
Thu Dec 4 02:57:49 EST 2008


On Nov 27, 2008, at 11:36 AM, Anton Vorontsov wrote:

> Just found the merge issue in 442746989d92afc125040e0f29b33602ad94da99
> ("powerpc/83xx: Add support for MCU microcontroller in .dts files"):
> the commit adds the MCU controller node into the DMA node, which is
> wrong because the MCU sits on the I2C bus. Fix this by moving the MCU
> node into the I2C controller node.
>
> The original patch[1] was OK though. ;-)
>
> [1] http://patchwork.ozlabs.org/patch/4895/
>
> Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
> ---
> arch/powerpc/boot/dts/mpc8349emitx.dts |   16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)

applied to merge

- k




More information about the Linuxppc-dev mailing list