aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/dma-mapping.h2
-rw-r--r--include/asm-powerpc/ppc-pci.h2
-rw-r--r--include/linux/ext3_fs_i.h2
-rw-r--r--include/linux/ext4_fs_i.h2
-rw-r--r--include/linux/radix-tree.h4
-rw-r--r--include/linux/security.h2
-rw-r--r--include/linux/usb.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index abfb75b654c7..c8b5d0db0cf0 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -445,7 +445,7 @@ extern void dmabounce_unregister_dev(struct device *);
445 * 445 *
446 * The dmabounce routines call this function whenever a dma-mapping 446 * The dmabounce routines call this function whenever a dma-mapping
447 * is requested to determine whether a given buffer needs to be bounced 447 * is requested to determine whether a given buffer needs to be bounced
448 * or not. The function must return 0 if the the buffer is OK for 448 * or not. The function must return 0 if the buffer is OK for
449 * DMA access and 1 if the buffer needs to be bounced. 449 * DMA access and 1 if the buffer needs to be bounced.
450 * 450 *
451 */ 451 */
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index d74b2965bb82..6dcd7a811fe1 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -64,7 +64,7 @@ struct pci_dev *pci_get_device_by_addr(unsigned long addr);
64 * eeh_slot_error_detail -- record and EEH error condition to the log 64 * eeh_slot_error_detail -- record and EEH error condition to the log
65 * @severity: 1 if temporary, 2 if permanent failure. 65 * @severity: 1 if temporary, 2 if permanent failure.
66 * 66 *
67 * Obtains the the EEH error details from the RTAS subsystem, 67 * Obtains the EEH error details from the RTAS subsystem,
68 * and then logs these details with the RTAS error log system. 68 * and then logs these details with the RTAS error log system.
69 */ 69 */
70void eeh_slot_error_detail (struct pci_dn *pdn, int severity); 70void eeh_slot_error_detail (struct pci_dn *pdn, int severity);
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index 4395e5206746..7894dd0f3b77 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -54,7 +54,7 @@ struct ext3_block_alloc_info {
54 /* 54 /*
55 * Was i_next_alloc_goal in ext3_inode_info 55 * Was i_next_alloc_goal in ext3_inode_info
56 * is the *physical* companion to i_next_alloc_block. 56 * is the *physical* companion to i_next_alloc_block.
57 * it the the physical block number of the block which was most-recentl 57 * it the physical block number of the block which was most-recentl
58 * allocated to this file. This give us the goal (target) for the next 58 * allocated to this file. This give us the goal (target) for the next
59 * allocation when we detect linearly ascending requests. 59 * allocation when we detect linearly ascending requests.
60 */ 60 */
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index bb42379cb7fd..d5b177e5b395 100644
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -52,7 +52,7 @@ struct ext4_block_alloc_info {
52 /* 52 /*
53 * Was i_next_alloc_goal in ext4_inode_info 53 * Was i_next_alloc_goal in ext4_inode_info
54 * is the *physical* companion to i_next_alloc_block. 54 * is the *physical* companion to i_next_alloc_block.
55 * it the the physical block number of the block which was most-recentl 55 * it the physical block number of the block which was most-recentl
56 * allocated to this file. This give us the goal (target) for the next 56 * allocated to this file. This give us the goal (target) for the next
57 * allocation when we detect linearly ascending requests. 57 * allocation when we detect linearly ascending requests.
58 */ 58 */
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 0deb842541ac..f9e77d2ee320 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -87,10 +87,10 @@ do { \
87 * management of their lifetimes must be completely managed by API users. 87 * management of their lifetimes must be completely managed by API users.
88 * 88 *
89 * For API usage, in general, 89 * For API usage, in general,
90 * - any function _modifying_ the the tree or tags (inserting or deleting 90 * - any function _modifying_ the tree or tags (inserting or deleting
91 * items, setting or clearing tags must exclude other modifications, and 91 * items, setting or clearing tags must exclude other modifications, and
92 * exclude any functions reading the tree. 92 * exclude any functions reading the tree.
93 * - any function _reading_ the the tree or tags (looking up items or tags, 93 * - any function _reading_ the tree or tags (looking up items or tags,
94 * gang lookups) must exclude modifications to the tree, but may occur 94 * gang lookups) must exclude modifications to the tree, but may occur
95 * concurrently with other readers. 95 * concurrently with other readers.
96 * 96 *
diff --git a/include/linux/security.h b/include/linux/security.h
index 47e82c120f9a..9eb9e0fe0331 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -322,7 +322,7 @@ struct request_sock;
322 * @dir contains the inode structure of parent of the new file. 322 * @dir contains the inode structure of parent of the new file.
323 * @dentry contains the dentry structure of the new file. 323 * @dentry contains the dentry structure of the new file.
324 * @mode contains the mode of the new file. 324 * @mode contains the mode of the new file.
325 * @dev contains the the device number. 325 * @dev contains the device number.
326 * Return 0 if permission is granted. 326 * Return 0 if permission is granted.
327 * @inode_rename: 327 * @inode_rename:
328 * Check for permission to rename a file or directory. 328 * Check for permission to rename a file or directory.
diff --git a/include/linux/usb.h b/include/linux/usb.h
index cfbd2bb8fa2c..94bd38a6d947 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -126,7 +126,7 @@ enum usb_interface_condition {
126 * Each interface may have alternate settings. The initial configuration 126 * Each interface may have alternate settings. The initial configuration
127 * of a device sets altsetting 0, but the device driver can change 127 * of a device sets altsetting 0, but the device driver can change
128 * that setting using usb_set_interface(). Alternate settings are often 128 * that setting using usb_set_interface(). Alternate settings are often
129 * used to control the the use of periodic endpoints, such as by having 129 * used to control the use of periodic endpoints, such as by having
130 * different endpoints use different amounts of reserved USB bandwidth. 130 * different endpoints use different amounts of reserved USB bandwidth.
131 * All standards-conformant USB devices that use isochronous endpoints 131 * All standards-conformant USB devices that use isochronous endpoints
132 * will use them in non-default settings. 132 * will use them in non-default settings.