diff options
-rw-r--r-- | Documentation/kbuild/kbuild.txt | 2 | ||||
-rw-r--r-- | Documentation/kbuild/makefiles.txt | 3 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 5 | ||||
-rw-r--r-- | drivers/net/qla3xxx.c | 2 | ||||
-rw-r--r-- | net/core/dev_addr_lists.c | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 4a990317b84a..8f63b224ab09 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -146,7 +146,7 @@ INSTALL_MOD_STRIP | |||
146 | INSTALL_MOD_STRIP, if defined, will cause modules to be | 146 | INSTALL_MOD_STRIP, if defined, will cause modules to be |
147 | stripped after they are installed. If INSTALL_MOD_STRIP is '1', then | 147 | stripped after they are installed. If INSTALL_MOD_STRIP is '1', then |
148 | the default option --strip-debug will be used. Otherwise, | 148 | the default option --strip-debug will be used. Otherwise, |
149 | INSTALL_MOD_STRIP will used as the options to the strip command. | 149 | INSTALL_MOD_STRIP value will be used as the options to the strip command. |
150 | 150 | ||
151 | INSTALL_FW_PATH | 151 | INSTALL_FW_PATH |
152 | -------------------------------------------------- | 152 | -------------------------------------------------- |
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 86e3cd0d26a0..5d145bb443c0 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
@@ -1325,7 +1325,8 @@ The top Makefile exports the following variables: | |||
1325 | If this variable is specified, will cause modules to be stripped | 1325 | If this variable is specified, will cause modules to be stripped |
1326 | after they are installed. If INSTALL_MOD_STRIP is '1', then the | 1326 | after they are installed. If INSTALL_MOD_STRIP is '1', then the |
1327 | default option --strip-debug will be used. Otherwise, | 1327 | default option --strip-debug will be used. Otherwise, |
1328 | INSTALL_MOD_STRIP will used as the option(s) to the strip command. | 1328 | INSTALL_MOD_STRIP value will be used as the option(s) to the strip |
1329 | command. | ||
1329 | 1330 | ||
1330 | 1331 | ||
1331 | === 9 Makefile language | 1332 | === 9 Makefile language |
@@ -666,7 +666,7 @@ export MODLIB | |||
666 | # INSTALL_MOD_STRIP, if defined, will cause modules to be | 666 | # INSTALL_MOD_STRIP, if defined, will cause modules to be |
667 | # stripped after they are installed. If INSTALL_MOD_STRIP is '1', then | 667 | # stripped after they are installed. If INSTALL_MOD_STRIP is '1', then |
668 | # the default option --strip-debug will be used. Otherwise, | 668 | # the default option --strip-debug will be used. Otherwise, |
669 | # INSTALL_MOD_STRIP will used as the options to the strip command. | 669 | # INSTALL_MOD_STRIP value will be used as the options to the strip command. |
670 | 670 | ||
671 | ifdef INSTALL_MOD_STRIP | 671 | ifdef INSTALL_MOD_STRIP |
672 | ifeq ($(INSTALL_MOD_STRIP),1) | 672 | ifeq ($(INSTALL_MOD_STRIP),1) |
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index ef932ba55a0b..5ae1d9ee2cf1 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) | |||
722 | /* | 722 | /* |
723 | * MXC NANDFC can only perform full page+spare or | 723 | * MXC NANDFC can only perform full page+spare or |
724 | * spare-only read/write. When the upper layers | 724 | * spare-only read/write. When the upper layers |
725 | * layers perform a read/write buf operation, | 725 | * perform a read/write buf operation, the saved column |
726 | * we will used the saved column address to index into | 726 | * address is used to index into the full page. |
727 | * the full page. | ||
728 | */ | 727 | */ |
729 | host->send_addr(host, 0, page_addr == -1); | 728 | host->send_addr(host, 0, page_addr == -1); |
730 | if (mtd->writesize > 512) | 729 | if (mtd->writesize > 512) |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 1a3584edd79c..42fbf42ebee0 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -2460,7 +2460,7 @@ map_error: | |||
2460 | * The 3032 supports sglists by using the 3 addr/len pairs (ALP) | 2460 | * The 3032 supports sglists by using the 3 addr/len pairs (ALP) |
2461 | * in the IOCB plus a chain of outbound address lists (OAL) that | 2461 | * in the IOCB plus a chain of outbound address lists (OAL) that |
2462 | * each contain 5 ALPs. The last ALP of the IOCB (3rd) or OAL (5th) | 2462 | * each contain 5 ALPs. The last ALP of the IOCB (3rd) or OAL (5th) |
2463 | * will used to point to an OAL when more ALP entries are required. | 2463 | * will be used to point to an OAL when more ALP entries are required. |
2464 | * The IOCB is always the top of the chain followed by one or more | 2464 | * The IOCB is always the top of the chain followed by one or more |
2465 | * OALs (when necessary). | 2465 | * OALs (when necessary). |
2466 | */ | 2466 | */ |
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 508f9c18992f..8878c716ae0c 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); | |||
357 | /** | 357 | /** |
358 | * dev_addr_del_multiple - Delete device addresses by another device | 358 | * dev_addr_del_multiple - Delete device addresses by another device |
359 | * @to_dev: device where the addresses will be deleted | 359 | * @to_dev: device where the addresses will be deleted |
360 | * @from_dev: device by which addresses the addresses will be deleted | 360 | * @from_dev: device supplying the addresses to be deleted |
361 | * @addr_type: address type - 0 means type will used from from_dev | 361 | * @addr_type: address type - 0 means type will be used from from_dev |
362 | * | 362 | * |
363 | * Deletes addresses in to device by the list of addresses in from device. | 363 | * Deletes addresses in to device by the list of addresses in from device. |
364 | * | 364 | * |