diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /include | |
parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acmacros.h | 4 | ||||
-rw-r--r-- | include/acpi/actypes.h | 2 | ||||
-rw-r--r-- | include/linux/mtd/mtd.h | 2 | ||||
-rw-r--r-- | include/linux/ncp_fs.h | 2 | ||||
-rw-r--r-- | include/linux/spi/spi.h | 4 | ||||
-rw-r--r-- | include/mtd/ubi-user.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index a597207e2835..1954c9d1d012 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
@@ -333,8 +333,8 @@ struct acpi_integer_overlay { | |||
333 | #define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask)) | 333 | #define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask)) |
334 | 334 | ||
335 | /* | 335 | /* |
336 | * An struct acpi_namespace_node can appear in some contexts | 336 | * A struct acpi_namespace_node can appear in some contexts |
337 | * where a pointer to an union acpi_operand_object can also | 337 | * where a pointer to a union acpi_operand_object can also |
338 | * appear. This macro is used to distinguish them. | 338 | * appear. This macro is used to distinguish them. |
339 | * | 339 | * |
340 | * The "Descriptor" field is the first field in both structures. | 340 | * The "Descriptor" field is the first field in both structures. |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 7220361790b3..8222e8de0d1c 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -467,7 +467,7 @@ typedef u32 acpi_object_type; | |||
467 | 467 | ||
468 | /* | 468 | /* |
469 | * These are special object types that never appear in | 469 | * These are special object types that never appear in |
470 | * a Namespace node, only in an union acpi_operand_object | 470 | * a Namespace node, only in a union acpi_operand_object |
471 | */ | 471 | */ |
472 | #define ACPI_TYPE_LOCAL_EXTRA 0x1C | 472 | #define ACPI_TYPE_LOCAL_EXTRA 0x1C |
473 | #define ACPI_TYPE_LOCAL_DATA 0x1D | 473 | #define ACPI_TYPE_LOCAL_DATA 0x1D |
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index eae26bb6430a..64433eb411d7 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
@@ -83,7 +83,7 @@ typedef enum { | |||
83 | * @datbuf: data buffer - if NULL only oob data are read/written | 83 | * @datbuf: data buffer - if NULL only oob data are read/written |
84 | * @oobbuf: oob data buffer | 84 | * @oobbuf: oob data buffer |
85 | * | 85 | * |
86 | * Note, it is allowed to read more then one OOB area at one go, but not write. | 86 | * Note, it is allowed to read more than one OOB area at one go, but not write. |
87 | * The interface assumes that the OOB write requests program only one page's | 87 | * The interface assumes that the OOB write requests program only one page's |
88 | * OOB area. | 88 | * OOB area. |
89 | */ | 89 | */ |
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 9f2d76347f19..f69e66d151cc 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
@@ -87,7 +87,7 @@ struct ncp_objectname_ioctl | |||
87 | #define NCP_AUTH_NDS 0x32 | 87 | #define NCP_AUTH_NDS 0x32 |
88 | int auth_type; | 88 | int auth_type; |
89 | size_t object_name_len; | 89 | size_t object_name_len; |
90 | void __user * object_name; /* an userspace data, in most cases user name */ | 90 | void __user * object_name; /* a userspace data, in most cases user name */ |
91 | }; | 91 | }; |
92 | 92 | ||
93 | struct ncp_privatedata_ioctl | 93 | struct ncp_privatedata_ioctl |
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 82229317753d..68bb1c501d0d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
@@ -327,9 +327,9 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); | |||
327 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped | 327 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped |
328 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped | 328 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped |
329 | * @len: size of rx and tx buffers (in bytes) | 329 | * @len: size of rx and tx buffers (in bytes) |
330 | * @speed_hz: Select a speed other then the device default for this | 330 | * @speed_hz: Select a speed other than the device default for this |
331 | * transfer. If 0 the default (from @spi_device) is used. | 331 | * transfer. If 0 the default (from @spi_device) is used. |
332 | * @bits_per_word: select a bits_per_word other then the device default | 332 | * @bits_per_word: select a bits_per_word other than the device default |
333 | * for this transfer. If 0 the default (from @spi_device) is used. | 333 | * for this transfer. If 0 the default (from @spi_device) is used. |
334 | * @cs_change: affects chipselect after this transfer completes | 334 | * @cs_change: affects chipselect after this transfer completes |
335 | * @delay_usecs: microseconds to delay after this transfer before | 335 | * @delay_usecs: microseconds to delay after this transfer before |
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index ccdc562e444e..2dc2eb2b8e22 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h | |||
@@ -253,7 +253,7 @@ struct ubi_mkvol_req { | |||
253 | * | 253 | * |
254 | * Re-sizing is possible for both dynamic and static volumes. But while dynamic | 254 | * Re-sizing is possible for both dynamic and static volumes. But while dynamic |
255 | * volumes may be re-sized arbitrarily, static volumes cannot be made to be | 255 | * volumes may be re-sized arbitrarily, static volumes cannot be made to be |
256 | * smaller then the number of bytes they bear. To arbitrarily shrink a static | 256 | * smaller than the number of bytes they bear. To arbitrarily shrink a static |
257 | * volume, it must be wiped out first (by means of volume update operation with | 257 | * volume, it must be wiped out first (by means of volume update operation with |
258 | * zero number of bytes). | 258 | * zero number of bytes). |
259 | */ | 259 | */ |