diff options
-rw-r--r-- | Documentation/filesystems/nfsroot.txt | 2 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/marvell.txt | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/udbg_16550.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/udbg_scc.c | 2 | ||||
-rw-r--r-- | drivers/edac/edac_core.h | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 | ||||
-rw-r--r-- | drivers/md/md.h | 2 | ||||
-rw-r--r-- | drivers/net/bnx2x_reg.h | 2 | ||||
-rw-r--r-- | drivers/net/rionet.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_fs.h | 2 | ||||
-rw-r--r-- | include/linux/usb.h | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/Documentation/filesystems/nfsroot.txt b/Documentation/filesystems/nfsroot.txt index 68baddf3c3e0..3ba0b945aaf8 100644 --- a/Documentation/filesystems/nfsroot.txt +++ b/Documentation/filesystems/nfsroot.txt | |||
@@ -105,7 +105,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
105 | the client address and this parameter is NOT empty only | 105 | the client address and this parameter is NOT empty only |
106 | replies from the specified server are accepted. | 106 | replies from the specified server are accepted. |
107 | 107 | ||
108 | Only required for for NFS root. That is autoconfiguration | 108 | Only required for NFS root. That is autoconfiguration |
109 | will not be triggered if it is missing and NFS root is not | 109 | will not be triggered if it is missing and NFS root is not |
110 | in operation. | 110 | in operation. |
111 | 111 | ||
diff --git a/Documentation/powerpc/dts-bindings/marvell.txt b/Documentation/powerpc/dts-bindings/marvell.txt index 3708a2fd4747..f1533d91953a 100644 --- a/Documentation/powerpc/dts-bindings/marvell.txt +++ b/Documentation/powerpc/dts-bindings/marvell.txt | |||
@@ -32,7 +32,7 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. | |||
32 | devices. This field represents the number of cells needed to | 32 | devices. This field represents the number of cells needed to |
33 | represent the address of the memory-mapped registers of devices | 33 | represent the address of the memory-mapped registers of devices |
34 | within the system controller chip. | 34 | within the system controller chip. |
35 | - #size-cells : Size representation for for the memory-mapped | 35 | - #size-cells : Size representation for the memory-mapped |
36 | registers within the system controller chip. | 36 | registers within the system controller chip. |
37 | - #interrupt-cells : Defines the width of cells used to represent | 37 | - #interrupt-cells : Defines the width of cells used to represent |
38 | interrupts. | 38 | interrupts. |
diff --git a/arch/blackfin/mach-bf538/include/mach/defBF539.h b/arch/blackfin/mach-bf538/include/mach/defBF539.h index bdc330cd0e1c..1c58914a8740 100644 --- a/arch/blackfin/mach-bf538/include/mach/defBF539.h +++ b/arch/blackfin/mach-bf538/include/mach/defBF539.h | |||
@@ -2325,7 +2325,7 @@ | |||
2325 | #define AMBEN_B0_B1 0x0004 /* Enable Asynchronous Memory Banks 0 & 1 only */ | 2325 | #define AMBEN_B0_B1 0x0004 /* Enable Asynchronous Memory Banks 0 & 1 only */ |
2326 | #define AMBEN_B0_B1_B2 0x0006 /* Enable Asynchronous Memory Banks 0, 1, and 2 */ | 2326 | #define AMBEN_B0_B1_B2 0x0006 /* Enable Asynchronous Memory Banks 0, 1, and 2 */ |
2327 | #define AMBEN_ALL 0x0008 /* Enable Asynchronous Memory Banks (all) 0, 1, 2, and 3 */ | 2327 | #define AMBEN_ALL 0x0008 /* Enable Asynchronous Memory Banks (all) 0, 1, 2, and 3 */ |
2328 | #define CDPRIO 0x0100 /* DMA has priority over core for for external accesses */ | 2328 | #define CDPRIO 0x0100 /* DMA has priority over core for external accesses */ |
2329 | 2329 | ||
2330 | /* EBIU_AMGCTL Bit Positions */ | 2330 | /* EBIU_AMGCTL Bit Positions */ |
2331 | #define AMCKEN_P 0x0000 /* Enable CLKOUT */ | 2331 | #define AMCKEN_P 0x0000 /* Enable CLKOUT */ |
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index acb74a17bbbf..b4b167b33643 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * udbg for for NS16550 compatable serial ports | 2 | * udbg for NS16550 compatable serial ports |
3 | * | 3 | * |
4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp | 4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp |
5 | * | 5 | * |
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c index 572771fd8463..9490157da62e 100644 --- a/arch/powerpc/platforms/powermac/udbg_scc.c +++ b/arch/powerpc/platforms/powermac/udbg_scc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * udbg for for zilog scc ports as found on Apple PowerMacs | 2 | * udbg for zilog scc ports as found on Apple PowerMacs |
3 | * | 3 | * |
4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp | 4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp |
5 | * | 5 | * |
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 871c13b4c148..12f355cafdbe 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
@@ -286,7 +286,7 @@ enum scrub_type { | |||
286 | * is irrespective of the memory devices being mounted | 286 | * is irrespective of the memory devices being mounted |
287 | * on both sides of the memory stick. | 287 | * on both sides of the memory stick. |
288 | * | 288 | * |
289 | * Socket set: All of the memory sticks that are required for for | 289 | * Socket set: All of the memory sticks that are required for |
290 | * a single memory access or all of the memory sticks | 290 | * a single memory access or all of the memory sticks |
291 | * spanned by a chip-select row. A single socket set | 291 | * spanned by a chip-select row. A single socket set |
292 | * has two chip-select rows and if double-sided sticks | 292 | * has two chip-select rows and if double-sided sticks |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 02831ad070b8..4bd39c8af80f 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -809,7 +809,7 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd) | |||
809 | * errors. We only bother to do this at load time, because it's OK if | 809 | * errors. We only bother to do this at load time, because it's OK if |
810 | * it happened before we were loaded (first time after boot/reset), | 810 | * it happened before we were loaded (first time after boot/reset), |
811 | * but any time after that, it's fatal anyway. Also need to not check | 811 | * but any time after that, it's fatal anyway. Also need to not check |
812 | * for for upper byte errors if we are in 8 bit mode, so figure out | 812 | * for upper byte errors if we are in 8 bit mode, so figure out |
813 | * our width. For now, at least, also complain if it's 8 bit. | 813 | * our width. For now, at least, also complain if it's 8 bit. |
814 | */ | 814 | */ |
815 | static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev, | 815 | static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev, |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 7188c59a76ff..adb1e8c36b46 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -761,7 +761,7 @@ isdn_getnum(char **p) | |||
761 | * Be aware that this is not an atomic operation when sleep != 0, even though | 761 | * Be aware that this is not an atomic operation when sleep != 0, even though |
762 | * interrupts are turned off! Well, like that we are currently only called | 762 | * interrupts are turned off! Well, like that we are currently only called |
763 | * on behalf of a read system call on raw device files (which are documented | 763 | * on behalf of a read system call on raw device files (which are documented |
764 | * to be dangerous and for for debugging purpose only). The inode semaphore | 764 | * to be dangerous and for debugging purpose only). The inode semaphore |
765 | * takes care that this is not called for the same minor device number while | 765 | * takes care that this is not called for the same minor device number while |
766 | * we are sleeping, but access is not serialized against simultaneous read() | 766 | * we are sleeping, but access is not serialized against simultaneous read() |
767 | * from the corresponding ttyI device. Can other ugly events, like changes | 767 | * from the corresponding ttyI device. Can other ugly events, like changes |
@@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que | |||
873 | * Be aware that this is not an atomic operation when sleep != 0, even though | 873 | * Be aware that this is not an atomic operation when sleep != 0, even though |
874 | * interrupts are turned off! Well, like that we are currently only called | 874 | * interrupts are turned off! Well, like that we are currently only called |
875 | * on behalf of a read system call on raw device files (which are documented | 875 | * on behalf of a read system call on raw device files (which are documented |
876 | * to be dangerous and for for debugging purpose only). The inode semaphore | 876 | * to be dangerous and for debugging purpose only). The inode semaphore |
877 | * takes care that this is not called for the same minor device number while | 877 | * takes care that this is not called for the same minor device number while |
878 | * we are sleeping, but access is not serialized against simultaneous read() | 878 | * we are sleeping, but access is not serialized against simultaneous read() |
879 | * from the corresponding ttyI device. Can other ugly events, like changes | 879 | * from the corresponding ttyI device. Can other ugly events, like changes |
diff --git a/drivers/md/md.h b/drivers/md/md.h index f8fc188bc762..f55d2ff95133 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h | |||
@@ -201,7 +201,7 @@ struct mddev_s | |||
201 | * INTR: resync needs to be aborted for some reason | 201 | * INTR: resync needs to be aborted for some reason |
202 | * DONE: thread is done and is waiting to be reaped | 202 | * DONE: thread is done and is waiting to be reaped |
203 | * REQUEST: user-space has requested a sync (used with SYNC) | 203 | * REQUEST: user-space has requested a sync (used with SYNC) |
204 | * CHECK: user-space request for for check-only, no repair | 204 | * CHECK: user-space request for check-only, no repair |
205 | * RESHAPE: A reshape is happening | 205 | * RESHAPE: A reshape is happening |
206 | * | 206 | * |
207 | * If neither SYNC or RESHAPE are set, then it is a recovery. | 207 | * If neither SYNC or RESHAPE are set, then it is a recovery. |
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index 0695be14cf91..aa76cbada5e2 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
@@ -3122,7 +3122,7 @@ | |||
3122 | The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] - | 3122 | The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] - |
3123 | header pointer. */ | 3123 | header pointer. */ |
3124 | #define TCM_REG_XX_TABLE 0x50240 | 3124 | #define TCM_REG_XX_TABLE 0x50240 |
3125 | /* [RW 4] Load value for for cfc ac credit cnt. */ | 3125 | /* [RW 4] Load value for cfc ac credit cnt. */ |
3126 | #define TM_REG_CFC_AC_CRDCNT_VAL 0x164208 | 3126 | #define TM_REG_CFC_AC_CRDCNT_VAL 0x164208 |
3127 | /* [RW 4] Load value for cfc cld credit cnt. */ | 3127 | /* [RW 4] Load value for cfc cld credit cnt. */ |
3128 | #define TM_REG_CFC_CLD_CRDCNT_VAL 0x164210 | 3128 | #define TM_REG_CFC_CLD_CRDCNT_VAL 0x164210 |
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index bc98e7f69ee9..ede937ee50c7 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
@@ -72,7 +72,7 @@ static int rionet_check = 0; | |||
72 | static int rionet_capable = 1; | 72 | static int rionet_capable = 1; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * This is a fast lookup table for for translating TX | 75 | * This is a fast lookup table for translating TX |
76 | * Ethernet packets into a destination RIO device. It | 76 | * Ethernet packets into a destination RIO device. It |
77 | * could be made into a hash table to save memory depending | 77 | * could be made into a hash table to save memory depending |
78 | * on system trade-offs. | 78 | * on system trade-offs. |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index c2f1b7df918c..b5b83c43898a 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
@@ -242,7 +242,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
242 | * System suspend currently expects to be able to suspend the entire | 242 | * System suspend currently expects to be able to suspend the entire |
243 | * device tree, device-at-a-time. If we failed selective suspend | 243 | * device tree, device-at-a-time. If we failed selective suspend |
244 | * reports, system suspend would fail; so the root hub code must claim | 244 | * reports, system suspend would fail; so the root hub code must claim |
245 | * success. That's lying to usbcore, and it matters for for runtime | 245 | * success. That's lying to usbcore, and it matters for runtime |
246 | * PM scenarios with selective suspend and remote wakeup... | 246 | * PM scenarios with selective suspend and remote wakeup... |
247 | */ | 247 | */ |
248 | if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev)) | 248 | if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev)) |
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 2bfff30f4704..48b9e889a18b 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -37,7 +37,7 @@ typedef __u16 __bitwise __hc16; | |||
37 | #define __hc16 __le16 | 37 | #define __hc16 __le16 |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | /* statistics can be kept for for tuning/monitoring */ | 40 | /* statistics can be kept for tuning/monitoring */ |
41 | struct ehci_stats { | 41 | struct ehci_stats { |
42 | /* irq usage */ | 42 | /* irq usage */ |
43 | unsigned long normal; | 43 | unsigned long normal; |
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index c4ea51b55dce..f52ac276277e 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h | |||
@@ -117,7 +117,7 @@ struct getbmapx { | |||
117 | #define BMV_IF_VALID \ | 117 | #define BMV_IF_VALID \ |
118 | (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC|BMV_IF_DELALLOC) | 118 | (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC|BMV_IF_DELALLOC) |
119 | 119 | ||
120 | /* bmv_oflags values - returned for for each non-header segment */ | 120 | /* bmv_oflags values - returned for each non-header segment */ |
121 | #define BMV_OF_PREALLOC 0x1 /* segment = unwritten pre-allocation */ | 121 | #define BMV_OF_PREALLOC 0x1 /* segment = unwritten pre-allocation */ |
122 | #define BMV_OF_DELALLOC 0x2 /* segment = delayed allocation */ | 122 | #define BMV_OF_DELALLOC 0x2 /* segment = delayed allocation */ |
123 | #define BMV_OF_LAST 0x4 /* segment is the last in the file */ | 123 | #define BMV_OF_LAST 0x4 /* segment is the last in the file */ |
diff --git a/include/linux/usb.h b/include/linux/usb.h index a8fe05f224e5..19fabc487beb 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -1071,7 +1071,7 @@ typedef void (*usb_complete_t)(struct urb *); | |||
1071 | * @start_frame: Returns the initial frame for isochronous transfers. | 1071 | * @start_frame: Returns the initial frame for isochronous transfers. |
1072 | * @number_of_packets: Lists the number of ISO transfer buffers. | 1072 | * @number_of_packets: Lists the number of ISO transfer buffers. |
1073 | * @interval: Specifies the polling interval for interrupt or isochronous | 1073 | * @interval: Specifies the polling interval for interrupt or isochronous |
1074 | * transfers. The units are frames (milliseconds) for for full and low | 1074 | * transfers. The units are frames (milliseconds) for full and low |
1075 | * speed devices, and microframes (1/8 millisecond) for highspeed ones. | 1075 | * speed devices, and microframes (1/8 millisecond) for highspeed ones. |
1076 | * @error_count: Returns the number of ISO transfers that reported errors. | 1076 | * @error_count: Returns the number of ISO transfers that reported errors. |
1077 | * @context: For use in completion functions. This normally points to | 1077 | * @context: For use in completion functions. This normally points to |