From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org-S964953AbWEYEJe@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S964953AbWEYEJe (ORCPT <rfc822;willy@w.ods.org>);
	Thu, 25 May 2006 00:09:34 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964859AbWEYEJd
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 25 May 2006 00:09:33 -0400
Received: from ns1.suse.de ([195.135.220.2]:13293 "EHLO mx1.suse.de")
	by vger.kernel.org with ESMTP id S964953AbWEYEJd (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 25 May 2006 00:09:33 -0400
Date: Wed, 24 May 2006 21:07:17 -0700
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
Message-ID: <20060525040717.GA30317@kroah.com>
References: <20060525002742.723577000@linux-m68k.org> <20060525003420.147932000@linux-m68k.org> <20060524183327.601f0a43.akpm@osdl.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060524183327.601f0a43.akpm@osdl.org>
User-Agent: Mutt/1.5.11
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.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