Note: This patch is for upstream (2.6.33) and occured after having merged linux-kbuild tree [1] in linus-tree. - Sedat - [1] http://repo.or.cz/w/linux-kbuild.git On Thu, Dec 24, 2009 at 8:31 AM, Zhu Yi <yi.zhu@xxxxxxxxx> wrote: > Commit 900bb717424e5df12b1ef7ebb017be2a8915b806 uses UTS_RELEASE > as the the in-tree iwlwifi driver version. However the inclusion > of generated/utsrelease.h makes it a unpleasant behaviour to > recompile the driver everytime when utsrelease.h is updated. In > fact, the driver module is already built with the UTS_RELEASE > information via vermagic of modinfo. Mark the in-tree driver > with the version string "in-tree" to distinguish with those old > out-of-tree drivers. > > Reported-by: David Miller <davem@xxxxxxxxxxxxx> > Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-core.h | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h > index 308f679..375226b 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.h > +++ b/drivers/net/wireless/iwlwifi/iwl-core.h > @@ -63,8 +63,6 @@ > #ifndef __iwl_core_h__ > #define __iwl_core_h__ > > -#include <generated/utsrelease.h> > - > /************************ > * forward declarations * > ************************/ > @@ -72,7 +70,7 @@ struct iwl_host_cmd; > struct iwl_cmd; > > > -#define IWLWIFI_VERSION UTS_RELEASE "-k" > +#define IWLWIFI_VERSION "in-tree:" > #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" > #define DRV_AUTHOR "<ilw@xxxxxxxxxxxxxxx>" > > -- > 1.6.3.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
