[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120719170827.32067d18457dc0e6c3b644f5@canb.auug.org.au>
Date: Thu, 19 Jul 2012 17:08:27 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
"Javier M. Mellid" <jmunhoz@...lia.com>
Subject: linux-next: build failure after merge of the final tree
Hi all,
After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:
drivers/staging/sm7xxfb/sm7xxfb.c: In function 'smtcfb_pci_probe':
drivers/staging/sm7xxfb/sm7xxfb.c:829:33: error: 'smtc_screen_info' undeclared (first use in this function)
Caused by commit 013db67415d1 ("staging: sm7xxfb: rename smtc_screen_info
to smtc_scr_info"). Grep is your friend.
I have added the following patch for today.
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 19 Jul 2012 17:04:39 +1000
Subject: [PATCH] staging: sm7xxfb: fix for "rename smtc_screen_info to smtc_scr_info"
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 90c90db..1c1780c 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -826,7 +826,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
#ifdef __BIG_ENDIAN
if (sfb->fb.var.bits_per_pixel == 24)
- sfb->fb.var.bits_per_pixel = (smtc_screen_info.lfb_depth = 32);
+ sfb->fb.var.bits_per_pixel = (smtc_scr_info.lfb_depth = 32);
#endif
/* Map address and memory detection */
pFramebufferPhysical = pci_resource_start(pdev, 0);
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists