From aa0400587c36f2a1a57b8f1f292eec14bb9a834d Mon Sep 17 00:00:00 2001 From: Rogerio Pimentel Date: Mon, 25 Oct 2010 12:54:24 -0200 Subject: [PATCH] --- yaml --- r: 221044 b: refs/heads/master c: b8be7b9a6d3c7b63df9fc356a81288d5404ff505 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/mach-mx31_3ds.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 156a3a063696..b04efc5776a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e9aed156b7bc42311370b155f73ee5961b8557d +refs/heads/master: b8be7b9a6d3c7b63df9fc356a81288d5404ff505 diff --git a/trunk/arch/arm/mach-mx3/mach-mx31_3ds.c b/trunk/arch/arm/mach-mx3/mach-mx31_3ds.c index bc21efce1645..56fff3bb1243 100644 --- a/trunk/arch/arm/mach-mx3/mach-mx31_3ds.c +++ b/trunk/arch/arm/mach-mx3/mach-mx31_3ds.c @@ -251,9 +251,9 @@ static void __init mxc_board_init(void) mx31_3ds_usbotg_init(); mxc_register_device(&mxc_otg_udc_device, &usbotg_pdata); - if (!mxc_expio_init(CS5_BASE_ADDR, EXPIO_PARENT_INT)) - printk(KERN_WARNING "Init of the debugboard failed, all " - "devices on the board are unusable.\n"); + if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT)) + printk(KERN_WARNING "Init of the debug board failed, all " + "devices on the debug board are unusable.\n"); } static void __init mx31_3ds_timer_init(void)