Commit ad19d8d9 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King

[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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5c64e2ab
...@@ -47,6 +47,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ ...@@ -47,6 +47,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
board-rx51-peripherals.o \ board-rx51-peripherals.o \
mmc-twl4030.o
# Platform specific device init code # Platform specific device init code
ifeq ($(CONFIG_USB_MUSB_SOC),y) ifeq ($(CONFIG_USB_MUSB_SOC),y)
obj-y += usb-musb.o obj-y += usb-musb.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment