On Sun, 9 Jan 2011, Gilles Espinasse wrote: > Signed-off-by: Gilles Espinasse <g.esp@xxxxxxx> > --- > Documentation/kbuild/kbuild.txt | 2 +- > Documentation/kbuild/makefiles.txt | 3 ++- > Makefile | 2 +- > drivers/mtd/nand/mxc_nand.c | 5 ++--- > drivers/net/qla3xxx.c | 2 +- > net/core/dev_addr_lists.c | 4 ++-- > 6 files changed, 9 insertions(+), 9 deletions(-) Doesn't seem to be present in linux-next as of today, so I have picked it up. Thanks. > > diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt > index 1e5165a..559aa12 100644 > --- a/Documentation/kbuild/kbuild.txt > +++ b/Documentation/kbuild/kbuild.txt > @@ -138,7 +138,7 @@ INSTALL_MOD_STRIP > INSTALL_MOD_STRIP, if defined, will cause modules to be > stripped after they are installed. If INSTALL_MOD_STRIP is '1', then > the default option --strip-debug will be used. Otherwise, > -INSTALL_MOD_STRIP will used as the options to the strip command. > +INSTALL_MOD_STRIP value will be used as the options to the strip command. > > INSTALL_FW_PATH > -------------------------------------------------- > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 0ef00bd..2f37956 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -1310,7 +1310,8 @@ The top Makefile exports the following variables: > If this variable is specified, will cause modules to be stripped > after they are installed. If INSTALL_MOD_STRIP is '1', then the > default option --strip-debug will be used. Otherwise, > - INSTALL_MOD_STRIP will used as the option(s) to the strip command. > + INSTALL_MOD_STRIP value will be used as the option(s) to the strip > + command. > > > === 9 Makefile language > diff --git a/Makefile b/Makefile > index 74b2555..b4d6327 100644 > --- a/Makefile > +++ b/Makefile > @@ -665,7 +665,7 @@ export MODLIB > # INSTALL_MOD_STRIP, if defined, will cause modules to be > # stripped after they are installed. If INSTALL_MOD_STRIP is '1', then > # the default option --strip-debug will be used. Otherwise, > -# INSTALL_MOD_STRIP will used as the options to the strip command. > +# INSTALL_MOD_STRIP value will be used as the options to the strip command. > > ifdef INSTALL_MOD_STRIP > ifeq ($(INSTALL_MOD_STRIP),1) > diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c > index 214b03a..b9a22b7 100644 > --- a/drivers/mtd/nand/mxc_nand.c > +++ b/drivers/mtd/nand/mxc_nand.c > @@ -722,9 +722,8 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) > /* > * MXC NANDFC can only perform full page+spare or > * spare-only read/write. When the upper layers > - * layers perform a read/write buf operation, > - * we will used the saved column address to index into > - * the full page. > + * perform a read/write buf operation, the saved column > + * address is used to index into the full page. > */ > host->send_addr(host, 0, page_addr == -1); > if (mtd->writesize > 512) > diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c > index 1a3584e..42fbf42 100644 > --- a/drivers/net/qla3xxx.c > +++ b/drivers/net/qla3xxx.c > @@ -2460,7 +2460,7 @@ map_error: > * The 3032 supports sglists by using the 3 addr/len pairs (ALP) > * in the IOCB plus a chain of outbound address lists (OAL) that > * each contain 5 ALPs. The last ALP of the IOCB (3rd) or OAL (5th) > - * will used to point to an OAL when more ALP entries are required. > + * will be used to point to an OAL when more ALP entries are required. > * The IOCB is always the top of the chain followed by one or more > * OALs (when necessary). > */ > diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c > index 508f9c1..8878c71 100644 > --- a/net/core/dev_addr_lists.c > +++ b/net/core/dev_addr_lists.c > @@ -357,8 +357,8 @@ EXPORT_SYMBOL(dev_addr_add_multiple); > /** > * dev_addr_del_multiple - Delete device addresses by another device > * @to_dev: device where the addresses will be deleted > - * @from_dev: device by which addresses the addresses will be deleted > - * @addr_type: address type - 0 means type will used from from_dev > + * @from_dev: device supplying the addresses to be deleted > + * @addr_type: address type - 0 means type will be used from from_dev > * > * Deletes addresses in to device by the list of addresses in from device. > * > -- > 1.7.3.4 > -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-modules" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
