From: Jay Cliburn Subject: Re: [PATCH] atlx: move modinfo data from atlx.h to atl1.c Date: Tue, 26 May 2009 19:48:52 -0500 Message-ID: <20090526194852.05902e41@osprey.hogchain.net> References: <20090526223350.GJ19049@ldl.fc.hp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, scott.scriven@hp.com, netdev@vger.kernel.org To: Alex Chiang Return-path: Received: from an-out-0708.google.com ([209.85.132.240]:34101 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753697AbZE0Asz (ORCPT ); Tue, 26 May 2009 20:48:55 -0400 Received: by an-out-0708.google.com with SMTP id d40so9153095and.1 for ; Tue, 26 May 2009 17:48:56 -0700 (PDT) In-Reply-To: <20090526223350.GJ19049@ldl.fc.hp.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 26 May 2009 16:33:50 -0600 Alex Chiang wrote: > Both atl1.c and atl2.c include atlx.h, which defines some modinfo > stuff. But atl2.c seems like it doesn't want the modinfo data > from atlx.h, as it defines its own. > > Running modinfo on atl2.ko, we get conflicting information: > > $ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" > version: 2.2.3 > description: Atheros Fast Ethernet Network Driver > author: Atheros Corporation , Chris Snook > version: 2.1.3 > author: Xiong Huang , Chris Snook , Jay Cliburn > > Move the modinfo data out of atlx.h and into atl1.c to eliminate > the confusion: > > $ /sbin/modinfo drivers/net/atlx/atl1.ko | egrep "version|description|author" > version: 2.1.3 > author: Xiong Huang , Chris Snook , Jay Cliburn > description: Atheros L1 Gigabit Ethernet Driver > > $ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" > version: 2.2.3 > description: Atheros Fast Ethernet Network Driver > author: Atheros Corporation , Chris Snook > > Cc: Jay Cliburn > Reported-by: Scott Scriven > Signed-off-by: Alex Chiang Acked-by: Jay Cliburn > --- > atl1.c | 6 ++++++ > atlx.h | 6 ------ > 2 files changed, 6 insertions(+), 6 deletions(-) > --- > diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c > index 13f0bdc..152852f 100644 > --- a/drivers/net/atlx/atl1.c > +++ b/drivers/net/atlx/atl1.c > @@ -82,6 +82,12 @@ > > #include "atl1.h" > > +#define ATLX_DRIVER_VERSION "2.1.3" > +MODULE_AUTHOR("Xiong Huang , \ > + Chris Snook , Jay Cliburn "); > +MODULE_LICENSE("GPL"); > +MODULE_VERSION(ATLX_DRIVER_VERSION); > + > /* Temporary hack for merging atl1 and atl2 */ > #include "atlx.c" > > diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h > index 297a03d..14054b7 100644 > --- a/drivers/net/atlx/atlx.h > +++ b/drivers/net/atlx/atlx.h > @@ -29,12 +29,6 @@ > #include > #include > > -#define ATLX_DRIVER_VERSION "2.1.3" > -MODULE_AUTHOR("Xiong Huang , \ > - Chris Snook , Jay Cliburn "); > -MODULE_LICENSE("GPL"); > -MODULE_VERSION(ATLX_DRIVER_VERSION); > - > #define ATLX_ERR_PHY 2 > #define ATLX_ERR_PHY_SPEED 7 > #define ATLX_ERR_PHY_RES 8