* linux-next: build failure after merge of the final tree (fbdev tree related)
@ 2012-02-16 5:29 Stephen Rothwell
2012-02-19 21:33 ` [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected Florian Tobias Schandinat
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-02-16 5:29 UTC (permalink / raw)
To: Florian Tobias Schandinat, linux-fbdev
Cc: linux-next, linux-kernel, Ondrej Zary
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/video/i740fb.c: In function 'i740fb_remove':
drivers/video/i740fb.c:1192:7: error: 'par' undeclared (first use in this function)
Caused by commit 5350c65f4f15 ("Resurrect Intel740 driver: i740fb") from
the fbdev tree. CONFIG_MTRR is not defined for this build ...
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected
2012-02-16 5:29 linux-next: build failure after merge of the final tree (fbdev tree related) Stephen Rothwell
@ 2012-02-19 21:33 ` Florian Tobias Schandinat
2012-02-20 20:49 ` Ondrej Zary
0 siblings, 1 reply; 3+ messages in thread
From: Florian Tobias Schandinat @ 2012-02-19 21:33 UTC (permalink / raw)
To: linux-fbdev
Cc: linux-kernel, Florian Tobias Schandinat, Ondrej Zary,
Stephen Rothwell, linux-next
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---
drivers/video/i740fb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
index 8be0302..fe574d8 100644
--- a/drivers/video/i740fb.c
+++ b/drivers/video/i740fb.c
@@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev *dev)
struct fb_info *info = pci_get_drvdata(dev);
if (info) {
-#ifdef CONFIG_MTRR
struct i740fb_par *par = info->par;
+#ifdef CONFIG_MTRR
if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0);
par->mtrr_reg = -1;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected
2012-02-19 21:33 ` [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected Florian Tobias Schandinat
@ 2012-02-20 20:49 ` Ondrej Zary
0 siblings, 0 replies; 3+ messages in thread
From: Ondrej Zary @ 2012-02-20 20:49 UTC (permalink / raw)
To: Florian Tobias Schandinat
Cc: linux-fbdev, linux-kernel, Stephen Rothwell, linux-next
On Sunday 19 February 2012 22:33:31 Florian Tobias Schandinat wrote:
> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> ---
> drivers/video/i740fb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
> index 8be0302..fe574d8 100644
> --- a/drivers/video/i740fb.c
> +++ b/drivers/video/i740fb.c
> @@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev
> *dev) struct fb_info *info = pci_get_drvdata(dev);
>
> if (info) {
> -#ifdef CONFIG_MTRR
> struct i740fb_par *par = info->par;
>
> +#ifdef CONFIG_MTRR
> if (par->mtrr_reg >= 0) {
> mtrr_del(par->mtrr_reg, 0, 0);
> par->mtrr_reg = -1;
Thanks for fixing my stupid bug. I thought that I tested it without
CONFIG_MTRR. But obviously didn't.
--
Ondrej Zary
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-20 20:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-16 5:29 linux-next: build failure after merge of the final tree (fbdev tree related) Stephen Rothwell
2012-02-19 21:33 ` [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected Florian Tobias Schandinat
2012-02-20 20:49 ` Ondrej Zary
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).