[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200807221157.14371.bjorn.helgaas@hp.com>
Date: Tue, 22 Jul 2008 11:57:13 -0600
From: Bjorn Helgaas <bjorn.helgaas@...com>
To: Randy Dunlap <randy.dunlap@...cle.com>
Cc: linux-next@...r.kernel.org, lkml <linux-kernel@...r.kernel.org>
Subject: Re: linux-next build error (PNP/IXJ)
On Tuesday 22 July 2008 11:27:39 am Randy Dunlap wrote:
> I'm seeing several build errors in linux-next-20080722 that I haven't
> seen previously, although I don't know what changed to cause this.
>
> They are all basically the same, in ixj (drivers/telephony/ixj*), when
> CONFIG_PNP=n, and CONFIG_PHONE_IXJ=y or =m (so the actual error message
> varies depending on IXJ=y or =m):
>
> IXJ=y:
> ixj.c:(.text+0x329d98): undefined reference to `pnp_get_resource'
> or IXJ=m:
> ERROR: "pnp_get_resource" [drivers/telephony/ixj.ko] undefined!
>
>
> Suggestions?
I'd use something like the attached. I don't have a build environment
where CONFIG_PNP=n (all I have is x86 and ia64), so I haven't tested
this.
ixj: don't use PNP interfaces when CONFIG_PNP=n
This patch fixes a build problem when CONFIG_PNP=n.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@...com>
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 49cd979..51b7fb4 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -7588,6 +7588,7 @@ static IXJ *new_ixj(unsigned long port)
static int __init ixj_probe_isapnp(int *cnt)
{
+#ifdef CONFIG_PNP
int probe = 0;
int func = 0x110;
struct pnp_dev *dev = NULL, *old_dev = NULL;
@@ -7664,6 +7665,9 @@ static int __init ixj_probe_isapnp(int *cnt)
dev = NULL;
}
return probe;
+#else
+ return 0;
+#endif
}
static int __init ixj_probe_isa(int *cnt)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists