public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Andrew Morton <akpm@osdl.org>
Cc: zippel@linux-m68k.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 02/11] atyfb_base compile fix for CONFIG_PCI=n
Date: Wed, 24 May 2006 21:07:17 -0700	[thread overview]
Message-ID: <20060525040717.GA30317@kroah.com> (raw)
In-Reply-To: <20060524183327.601f0a43.akpm@osdl.org>

On Wed, May 24, 2006 at 06:33:27PM -0700, Andrew Morton wrote:
> zippel@linux-m68k.org wrote:
> >
> >  The atyfb_driver structure is only available if CONFIG_PCI is set.
> > 
> >  Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
> > 
> >  ---
> > 
> >   drivers/video/aty/atyfb_base.c |    4 ++++
> >   1 file changed, 4 insertions(+)
> > 
> >  Index: linux-2.6-mm/drivers/video/aty/atyfb_base.c
> >  ===================================================================
> >  --- linux-2.6-mm.orig/drivers/video/aty/atyfb_base.c
> >  +++ linux-2.6-mm/drivers/video/aty/atyfb_base.c
> >  @@ -3861,7 +3861,9 @@ static int __init atyfb_init(void)
> >       atyfb_setup(option);
> >   #endif
> >   
> >  +#ifdef CONFIG_PCI
> >       pci_register_driver(&atyfb_driver);
> >  +#endif
> >   #ifdef CONFIG_ATARI
> >       atyfb_atari_probe();
> >   #endif
> >  @@ -3870,7 +3872,9 @@ static int __init atyfb_init(void)
> >   
> >   static void __exit atyfb_exit(void)
> >   {
> >  +#ifdef CONFIG_PCI
> >   	pci_unregister_driver(&atyfb_driver);
> >  +#endif
> >   }
> 
> bah.  If pci_register_driver() was a macro we wouldn't need to do this all
> over the place.

Yes, this can be fixed easily in the pci.h header file, all other pci
functions are stubbed out properly if CONFIG_PCI is not enabled.  These
should be too.

Roman, care to make that change instead?

thanks,

greg k-h

  reply	other threads:[~2006-05-25  4:09 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-25  0:27 [PATCH 00/11] various m68k patches zippel
2006-05-25  0:27 ` [PATCH 01/11] completely initialize hw_regs_t in ide_setup_ports zippel
2006-05-25  0:27 ` [PATCH 02/11] atyfb_base compile fix for CONFIG_PCI=n zippel
2006-05-25  1:33   ` Andrew Morton
2006-05-25  4:07     ` Greg KH [this message]
2006-05-25  4:28       ` Andrew Morton
2006-05-30 12:21       ` Roman Zippel
2006-05-25  0:27 ` [PATCH 03/11] cleanup unistd.h zippel
2006-05-25  0:27 ` [PATCH 04/11] Remove some unused definitions in zorro.h zippel
2006-05-25  0:27 ` [PATCH 05/11] use c99 initializer zippel
2006-05-25  0:27 ` [PATCH 06/11] print correct stack trace zippel
2006-05-25  0:27 ` [PATCH 07/11] restore amikbd compatibility with 2.4 zippel
2006-05-25  1:36   ` Andrew Morton
2006-05-25  1:50     ` Roman Zippel
2006-05-25  0:27 ` [PATCH 08/11] extra delay zippel
2006-05-25  0:27 ` [PATCH 09/11] use proper defines for zone initialization zippel
2006-05-25  0:27 ` [PATCH 10/11] adjust to changed HARDIRQ_MASK zippel
2006-05-25  0:27 ` [PATCH 11/11] m68k mac VIA2 fixes and cleanups zippel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060525040717.GA30317@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=zippel@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox