On Wed, Apr 23, 2008 at 03:49:43AM -0700, David Miller wrote: > From: Tomas Winkler <tomas.winkler@xxxxxxxxx> > > --- a/drivers/net/wireless/iwlwifi/Makefile > > +++ b/drivers/net/wireless/iwlwifi/Makefile > > @@ -1,4 +1,4 @@ > > -obj-$(CONFIG_IWLCORE) := iwlcore.o > > +obj-$(CONFIG_IWLCORE) += iwlcore.o > > iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o > > I had to apply this patch by hand because "iwl-power.o" is not > present in the iwlcore-objs line in the current tree. > > Does it exist in John's wireless tree or something like that? This > new iwl-power.o object looks like it would be new code and a new > feature, which we wouldn't be able to add into the tree at this time > as all networking new features have gone into the merge window > already. FWIW, I don't have an iwl-power.c either. Please be careful to send patches against the actual upstream tree rather than a working tree. :-) > To expedite getting this bug fix applied, I've added this fix > by hand and will push it to Linus tonight. Thanks, Dave! John -- John W. Linville linville@xxxxxxxxxxxxx -- 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
