Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932211Ab0FGHsS (ORCPT ); Mon, 7 Jun 2010 03:48:18 -0400 Received: from smtp.nokia.com ([192.100.122.230]:61960 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756347Ab0FGHsQ (ORCPT ); Mon, 7 Jun 2010 03:48:16 -0400 Subject: Re: OMAP video compile error; regression from 2.6.33-rc4 onward (including current master) From: Tomi Valkeinen To: ext Luke-Jr Cc: "slapin@ossfans.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" In-Reply-To: <201006061652.39248.luke@dashjr.org> References: <201006061652.39248.luke@dashjr.org> Content-Type: text/plain; charset="UTF-8" Date: Mon, 07 Jun 2010 10:47:34 +0300 Message-ID: <1275896854.2549.14.camel@tubuntu.research.nokia.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 07 Jun 2010 07:47:40.0660 (UTC) FILETIME=[B4BDAB40:01CB0615] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2503 Lines: 60 On Sun, 2010-06-06 at 23:52 +0200, ext Luke-Jr wrote: > This doesn't even build, so I don't know how it was tested... Reverting the > offending commit (simple, but does require conflict resolution) at least lets > it compile, but I haven't tested whether it alone is enough to work in > practise yet... hoping Tomi might provide a real fix. Maybe even in time for > 2.6.35 final? :) > > https://bugzilla.kernel.org/show_bug.cgi?id=16144 > > CC drivers/video/omap/rfbi.o > drivers/video/omap/rfbi.c: In function 'rfbi_get_clocks': > drivers/video/omap/rfbi.c:86: error: 'dispc' undeclared (first use in this > function) > drivers/video/omap/rfbi.c:86: error: (Each undeclared identifier is reported > only once > drivers/video/omap/rfbi.c:86: error: for each function it appears in.) > make[1]: *** [drivers/video/omap/rfbi.o] Error 1 > make: *** [drivers/video/omap/rfbi.o] Error 2 > > The 'dispc' referred to herein is and has always been defined in > drivers/video/omap/dispc.c as an anonymous struct. I don't have any device that uses RFBI so I can't test it, but how about this patch: diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 1162603..eada9f1 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "omapfb.h" #include "dispc.h" @@ -83,13 +84,13 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); + rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick"); if (IS_ERR(rfbi.dss_ick)) { dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); + rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck"); if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/