From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ilya Yanok Date: Sat, 21 Jul 2012 00:17:31 +0400 Subject: [U-Boot] [PULL] u-boot-usb/master In-Reply-To: References: <201207191452.53818.marex@denx.de> <20120720071956.4B98720224C@gemini.denx.de> <201207202056.29464.marex@denx.de> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On Fri, Jul 20, 2012 at 10:59 PM, McClintock Matthew-B29882 < B29882@freescale.com> wrote: > On Fri, Jul 20, 2012 at 1:56 PM, Marek Vasut wrote: > > Dear McClintock Matthew-B29882, > > > > [...] > > > >> I think this merge is causing issues. Resetting to the previous merge > >> (ad8439d Merge branch 'sf' of git://git.denx.de/u-boot-blackfin) and > >> the issues go away. > >> > >> -M > >> > >> Generating include/generated/asm-offsets.h > >> bootm.c:329:16: error: expected ')' before '__attribute__' > including breaks __attribute__((noinline)) (has to be changed to noinline). I believe it's enough to fix this file and remove #define noinline from lib/vsprintf.c Regards, Ilya.