diff options
-rw-r--r-- | arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 2 | ||||
-rw-r--r-- | arch/m68k/mac/psc.c | 2 | ||||
-rw-r--r-- | drivers/net/via-velocity.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.c | 2 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 2 | ||||
-rw-r--r-- | fs/jbd2/transaction.c | 2 | ||||
-rw-r--r-- | net/ipv6/af_inet6.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S index 4dc99aa65d07..12467157afb9 100644 --- a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S +++ b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * The interrupt numbering scheme is defined in the | 26 | * The interrupt numbering scheme is defined in the |
27 | * interrupt controller spec. To wit: | 27 | * interrupt controller spec. To wit: |
28 | * | 28 | * |
29 | * Migrated the code from ARM MP port to be more consistant | 29 | * Migrated the code from ARM MP port to be more consistent |
30 | * with interrupt processing , the following still holds true | 30 | * with interrupt processing , the following still holds true |
31 | * however, all interrupts are treated the same regardless of | 31 | * however, all interrupts are treated the same regardless of |
32 | * if they are local IPI or PPI | 32 | * if they are local IPI or PPI |
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index ba6ccab64018..a4c3eb60706e 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c | |||
@@ -88,7 +88,7 @@ void __init psc_init(void) | |||
88 | 88 | ||
89 | /* | 89 | /* |
90 | * The PSC is always at the same spot, but using psc | 90 | * The PSC is always at the same spot, but using psc |
91 | * keeps things consisant with the psc_xxxx functions. | 91 | * keeps things consistent with the psc_xxxx functions. |
92 | */ | 92 | */ |
93 | 93 | ||
94 | psc = (void *) PSC_BASE; | 94 | psc = (void *) PSC_BASE; |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index cab96ad49e60..09cac704fdd7 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -898,7 +898,7 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status) | |||
898 | set_mii_flow_control(vptr); | 898 | set_mii_flow_control(vptr); |
899 | 899 | ||
900 | /* | 900 | /* |
901 | Check if new status is consisent with current status | 901 | Check if new status is consistent with current status |
902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || | 902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || |
903 | (mii_status==curr_status)) { | 903 | (mii_status==curr_status)) { |
904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); | 904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 8cde3a52d225..a2dbc94f6232 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -186,7 +186,7 @@ enum { | |||
186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m | 186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m |
187 | * | 187 | * |
188 | * This structure will be used to create a device specific poke table | 188 | * This structure will be used to create a device specific poke table |
189 | * to put the device in a consistant state at boot time. | 189 | * to put the device in a consistent state at boot time. |
190 | * | 190 | * |
191 | * @address: The device address to poke | 191 | * @address: The device address to poke |
192 | * | 192 | * |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index a7008c0c24f9..25506c777381 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -224,7 +224,7 @@ mraid_mm_unlocked_ioctl(struct file *filep, unsigned int cmd, | |||
224 | { | 224 | { |
225 | int err; | 225 | int err; |
226 | 226 | ||
227 | /* inconsistant: mraid_mm_compat_ioctl doesn't take the BKL */ | 227 | /* inconsistent: mraid_mm_compat_ioctl doesn't take the BKL */ |
228 | mutex_lock(&mraid_mm_mutex); | 228 | mutex_lock(&mraid_mm_mutex); |
229 | err = mraid_mm_ioctl(filep, cmd, arg); | 229 | err = mraid_mm_ioctl(filep, cmd, arg); |
230 | mutex_unlock(&mraid_mm_mutex); | 230 | mutex_unlock(&mraid_mm_mutex); |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 846a3f314111..5b2e4c30a2a1 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -207,7 +207,7 @@ repeat_locked: | |||
207 | * the committing transaction. Really, we only need to give it | 207 | * the committing transaction. Really, we only need to give it |
208 | * committing_transaction->t_outstanding_credits plus "enough" for | 208 | * committing_transaction->t_outstanding_credits plus "enough" for |
209 | * the log control blocks. | 209 | * the log control blocks. |
210 | * Also, this test is inconsitent with the matching one in | 210 | * Also, this test is inconsistent with the matching one in |
211 | * journal_extend(). | 211 | * journal_extend(). |
212 | */ | 212 | */ |
213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { | 213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 6bf0a242613e..c7934900dcdd 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -251,7 +251,7 @@ repeat: | |||
251 | * the committing transaction. Really, we only need to give it | 251 | * the committing transaction. Really, we only need to give it |
252 | * committing_transaction->t_outstanding_credits plus "enough" for | 252 | * committing_transaction->t_outstanding_credits plus "enough" for |
253 | * the log control blocks. | 253 | * the log control blocks. |
254 | * Also, this test is inconsitent with the matching one in | 254 | * Also, this test is inconsistent with the matching one in |
255 | * jbd2_journal_extend(). | 255 | * jbd2_journal_extend(). |
256 | */ | 256 | */ |
257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { | 257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 54e8e42f7a88..0935c5a42b1f 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -300,7 +300,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
300 | goto out; | 300 | goto out; |
301 | } | 301 | } |
302 | 302 | ||
303 | /* Reproduce AF_INET checks to make the bindings consitant */ | 303 | /* Reproduce AF_INET checks to make the bindings consistent */ |
304 | v4addr = addr->sin6_addr.s6_addr32[3]; | 304 | v4addr = addr->sin6_addr.s6_addr32[3]; |
305 | chk_addr_ret = inet_addr_type(net, v4addr); | 305 | chk_addr_ret = inet_addr_type(net, v4addr); |
306 | if (!sysctl_ip_nonlocal_bind && | 306 | if (!sysctl_ip_nonlocal_bind && |