2005-11-22 02:21:48

by Richard Knutsson

Subject: [PATCH -mm2] net: Fix compiler-error on atyfb_base.c when !CONFIG_PCI

From: Richard Knutsson <[email protected]>

Fix compiler-error on atyfb_base.c when CONFIG_PCI not set.

Signed-off-by: Richard Knutsson <[email protected]>

---

atyfb_base.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)

diff -Narup a/drivers/net/dgrs.c b/drivers/net/dgrs.c
--- a/drivers/video/aty/atyfb_base.c 2005-11-22 01:41:54.000000000 +0100
+++ b/drivers/video/aty/atyfb_base.c 2005-11-22 01:42:15.000000000 +0100
@@ -3606,7 +3606,8 @@ static struct pci_driver atyfb_driver =
.resume = atyfb_pci_resume,
#endif /* CONFIG_PM */
};
-
+#else
+static struct pci_driver atyfb_driver = {};
#endif /* CONFIG_PCI */

#ifndef MODULE

2005-11-22 02:50:12

by Al Viro

Subject: Re: [PATCH -mm2] net: Fix compiler-error on atyfb_base.c when !CONFIG_PCI

On Tue, Nov 22, 2005 at 03:21:42AM +0100, Richard Knutsson wrote:
> From: Richard Knutsson <[email protected]>
>
> Fix compiler-error on atyfb_base.c when CONFIG_PCI not set.

NAK. Please, don't introduce bogus objects.

2005-11-22 03:24:00

by Richard Knutsson

Subject: Re: [PATCH -mm2] net: Fix compiler-error on atyfb_base.c when !CONFIG_PCI

Richard Knutsson wrote:

>diff -Narup a/drivers/net/dgrs.c b/drivers/net/dgrs.c
>
>
Should of course be:

diff -Narup a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c


Lacy cut 'n' paste, sorry about that.
Richard