Gitweb:     http://git.kernel.org/linus/ad19d8d90c7a84c35f4e27e95d41a049efdbdf17
Commit:     ad19d8d90c7a84c35f4e27e95d41a049efdbdf17
Parent:     5c64e2abb3333684fc662eec776ca61ac009f825
Author:     Tony Lindgren <tony@atomide.com>
AuthorDate: Mon Mar 30 22:58:31 2009 +0100
Committer:  Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Wed Apr 1 22:14:51 2009 +0100

    [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>
---
 arch/arm/mach-omap2/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index a2c3fcc..c49d9bf 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o \
 
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \
 					   board-rx51-peripherals.o \
+					   mmc-twl4030.o
+
 # Platform specific device init code
 ifeq ($(CONFIG_USB_MUSB_SOC),y)
 obj-y					+= usb-musb.o
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html