From: Tony Lindgren <tony@atomide.com>
Date: Mon, 30 Mar 2009 21:58:31 +0000 (+0100)
Subject: [ARM] 5436/1: ARM: OMAP: Fix compile for rx51
X-Git-Tag: v2.6.30-rc1~242^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad19d8d90c7a84c35f4e27e95d41a049efdbdf17;p=pandora-kernel.git

[ARM] 5436/1: ARM: OMAP: Fix compile for rx51

This fixes a compile error caused by a mismerge while rebasing the patch:

linux-2.6/arch/arm/mach-omap2/board-rx51-peripherals.c:354:
undefined reference to `twl4030_mmc_init'

Looks like I need to also update my build scripts, just grepping for error:
in the logs is not obviously enough..

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed