* [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
@ 2008-07-11 14:36 David Howells
2008-07-11 15:05 ` Bjorn Helgaas
2008-07-13 5:16 ` Andrew Morton
0 siblings, 2 replies; 4+ messages in thread
From: David Howells @ 2008-07-11 14:36 UTC (permalink / raw)
To: bjorn.helgaas, akpm; +Cc: dhowells, kkeil, isdn4linux, linux-kernel
Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
accessed in that case.
The PNP=n variant was added by patch 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.
Signed-off-by: David Howells <dhowells@redhat.com>
---
drivers/isdn/hisax/hisax_fcpcipnp.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index c0b4db2..1925118 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
.remove = __devexit_p(fcpnp_remove),
.id_table = fcpnp_ids,
};
-#else
-static struct pnp_driver fcpnp_driver;
#endif
static void __devexit fcpci_remove(struct pci_dev *pdev)
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
2008-07-11 14:36 [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y David Howells
@ 2008-07-11 15:05 ` Bjorn Helgaas
2008-07-13 5:16 ` Andrew Morton
1 sibling, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2008-07-11 15:05 UTC (permalink / raw)
To: David Howells; +Cc: akpm, kkeil, isdn4linux, linux-kernel
On Friday 11 July 2008 8:36:48 am David Howells wrote:
> Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
> accessed in that case.
>
> The PNP=n variant was added by patch
> 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---
>
> drivers/isdn/hisax/hisax_fcpcipnp.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
>
> diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c
> b/drivers/isdn/hisax/hisax_fcpcipnp.c index c0b4db2..1925118 100644
> --- a/drivers/isdn/hisax/hisax_fcpcipnp.c
> +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
> @@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
> .remove = __devexit_p(fcpnp_remove),
> .id_table = fcpnp_ids,
> };
> -#else
> -static struct pnp_driver fcpnp_driver;
> #endif
>
> static void __devexit fcpci_remove(struct pci_dev *pdev)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
2008-07-11 14:36 [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y David Howells
2008-07-11 15:05 ` Bjorn Helgaas
@ 2008-07-13 5:16 ` Andrew Morton
2008-07-13 8:54 ` David Howells
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2008-07-13 5:16 UTC (permalink / raw)
To: David Howells; +Cc: bjorn.helgaas, kkeil, isdn4linux, linux-kernel
On Fri, 11 Jul 2008 15:36:48 +0100 David Howells <dhowells@redhat.com> wrote:
> Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
> accessed in that case.
>
> The PNP=n variant was added by patch 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.
>
Does this fix a build error or a warning or what? A warning, I think.
>
> diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
> index c0b4db2..1925118 100644
> --- a/drivers/isdn/hisax/hisax_fcpcipnp.c
> +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
> @@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
> .remove = __devexit_p(fcpnp_remove),
> .id_table = fcpnp_ids,
> };
> -#else
> -static struct pnp_driver fcpnp_driver;
> #endif
>
> static void __devexit fcpci_remove(struct pci_dev *pdev)
I have to run around and work out of the fix is needed in 2.6.25
or 2.6.26 or linux-next. Telling me this is always appreciated.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-07-13 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-11 14:36 [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y David Howells
2008-07-11 15:05 ` Bjorn Helgaas
2008-07-13 5:16 ` Andrew Morton
2008-07-13 8:54 ` David Howells
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.