diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6120.c | 2 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 8 | ||||
-rw-r--r-- | drivers/sbus/char/vfc_i2c.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 7468477ba837..993482545021 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -1534,7 +1534,7 @@ static int ipath_ht_early_init(struct ipath_devdata *dd) | |||
1534 | * @kbase: ipath_base_info pointer | 1534 | * @kbase: ipath_base_info pointer |
1535 | * | 1535 | * |
1536 | * We set the PCIE flag because the lower bandwidth on PCIe vs | 1536 | * We set the PCIE flag because the lower bandwidth on PCIe vs |
1537 | * HyperTransport can affect some user packet algorithims. | 1537 | * HyperTransport can affect some user packet algorithms. |
1538 | */ | 1538 | */ |
1539 | static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase) | 1539 | static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase) |
1540 | { | 1540 | { |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c index ae8bf9950c6d..05918e1e7c36 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c | |||
@@ -1293,7 +1293,7 @@ int __attribute__((weak)) ipath_unordered_wc(void) | |||
1293 | * @kbase: ipath_base_info pointer | 1293 | * @kbase: ipath_base_info pointer |
1294 | * | 1294 | * |
1295 | * We set the PCIE flag because the lower bandwidth on PCIe vs | 1295 | * We set the PCIE flag because the lower bandwidth on PCIe vs |
1296 | * HyperTransport can affect some user packet algorithims. | 1296 | * HyperTransport can affect some user packet algorithms. |
1297 | */ | 1297 | */ |
1298 | static int ipath_pe_get_base_info(struct ipath_portdata *pd, void *kbase) | 1298 | static int ipath_pe_get_base_info(struct ipath_portdata *pd, void *kbase) |
1299 | { | 1299 | { |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 4e3f127e4003..1b2df80c3bce 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -1680,7 +1680,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, | |||
1680 | * - we hit a gap in the sequence, so no reassembly/processing is | 1680 | * - we hit a gap in the sequence, so no reassembly/processing is |
1681 | * possible ('start' would be set to NULL) | 1681 | * possible ('start' would be set to NULL) |
1682 | * | 1682 | * |
1683 | * algorightm for this code is derived from code in the book | 1683 | * algorithm for this code is derived from code in the book |
1684 | * 'PPP Design And Debugging' by James Carlson (Addison-Wesley) | 1684 | * 'PPP Design And Debugging' by James Carlson (Addison-Wesley) |
1685 | */ | 1685 | */ |
1686 | while (start != NULL || newfrag != NULL) { | 1686 | while (start != NULL || newfrag != NULL) { |
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index d67105883341..bd000b802ee7 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -3253,7 +3253,7 @@ struct e1000_host_command_info { | |||
3253 | #define IFE_PMC_AUTO_MDIX 0x0080 /* 1=enable MDI/MDI-X feature, default 0=disabled */ | 3253 | #define IFE_PMC_AUTO_MDIX 0x0080 /* 1=enable MDI/MDI-X feature, default 0=disabled */ |
3254 | #define IFE_PMC_FORCE_MDIX 0x0040 /* 1=force MDIX-X, 0=force MDI */ | 3254 | #define IFE_PMC_FORCE_MDIX 0x0040 /* 1=force MDIX-X, 0=force MDI */ |
3255 | #define IFE_PMC_MDIX_STATUS 0x0020 /* 1=MDI-X, 0=MDI */ | 3255 | #define IFE_PMC_MDIX_STATUS 0x0020 /* 1=MDI-X, 0=MDI */ |
3256 | #define IFE_PMC_AUTO_MDIX_COMPLETE 0x0010 /* Resolution algorthm is completed */ | 3256 | #define IFE_PMC_AUTO_MDIX_COMPLETE 0x0010 /* Resolution algorithm is completed */ |
3257 | #define IFE_PMC_MDIX_MODE_SHIFT 6 | 3257 | #define IFE_PMC_MDIX_MODE_SHIFT 6 |
3258 | #define IFE_PHC_MDIX_RESET_ALL_MASK 0x0000 /* Disable auto MDI-X */ | 3258 | #define IFE_PHC_MDIX_RESET_ALL_MASK 0x0000 /* Disable auto MDI-X */ |
3259 | 3259 | ||
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 5eb81638e846..b04239792f63 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -1168,7 +1168,7 @@ wv_mmc_show(struct net_device * dev) | |||
1168 | m.mmr_unused0[6], | 1168 | m.mmr_unused0[6], |
1169 | m.mmr_unused0[7]); | 1169 | m.mmr_unused0[7]); |
1170 | #endif /* DEBUG_SHOW_UNUSED */ | 1170 | #endif /* DEBUG_SHOW_UNUSED */ |
1171 | printk(KERN_DEBUG "Encryption algorythm: %02X - Status: %02X\n", | 1171 | printk(KERN_DEBUG "Encryption algorithm: %02X - Status: %02X\n", |
1172 | m.mmr_des_avail, m.mmr_des_status); | 1172 | m.mmr_des_avail, m.mmr_des_status); |
1173 | #ifdef DEBUG_SHOW_UNUSED | 1173 | #ifdef DEBUG_SHOW_UNUSED |
1174 | printk(KERN_DEBUG "mmc_unused1[]: %02X:%02X:%02X:%02X:%02X\n", | 1174 | printk(KERN_DEBUG "mmc_unused1[]: %02X:%02X:%02X:%02X:%02X\n", |
@@ -3590,9 +3590,9 @@ wv_82593_config(struct net_device * dev) | |||
3590 | cfblk.acloc = TRUE; /* Disable source addr insertion by i82593 */ | 3590 | cfblk.acloc = TRUE; /* Disable source addr insertion by i82593 */ |
3591 | cfblk.preamb_len = 0; /* 2 bytes preamble (SFD) */ | 3591 | cfblk.preamb_len = 0; /* 2 bytes preamble (SFD) */ |
3592 | cfblk.loopback = FALSE; | 3592 | cfblk.loopback = FALSE; |
3593 | cfblk.lin_prio = 0; /* conform to 802.3 backoff algoritm */ | 3593 | cfblk.lin_prio = 0; /* conform to 802.3 backoff algorithm */ |
3594 | cfblk.exp_prio = 5; /* conform to 802.3 backoff algoritm */ | 3594 | cfblk.exp_prio = 5; /* conform to 802.3 backoff algorithm */ |
3595 | cfblk.bof_met = 1; /* conform to 802.3 backoff algoritm */ | 3595 | cfblk.bof_met = 1; /* conform to 802.3 backoff algorithm */ |
3596 | cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */ | 3596 | cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */ |
3597 | cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */ | 3597 | cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */ |
3598 | cfblk.slottim_hi = 0x0; | 3598 | cfblk.slottim_hi = 0x0; |
diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c index ceec30648f4f..9efed771f6c0 100644 --- a/drivers/sbus/char/vfc_i2c.c +++ b/drivers/sbus/char/vfc_i2c.c | |||
@@ -14,7 +14,7 @@ | |||
14 | /* NOTE: It seems to me that the documentation regarding the | 14 | /* NOTE: It seems to me that the documentation regarding the |
15 | pcd8584t/pcf8584 does not show the correct way to address the i2c bus. | 15 | pcd8584t/pcf8584 does not show the correct way to address the i2c bus. |
16 | Based on the information on the I2C bus itself and the remainder of | 16 | Based on the information on the I2C bus itself and the remainder of |
17 | the Phillips docs the following algorithims apper to be correct. I am | 17 | the Phillips docs the following algorithms appear to be correct. I am |
18 | fairly certain that the flowcharts in the phillips docs are wrong. */ | 18 | fairly certain that the flowcharts in the phillips docs are wrong. */ |
19 | 19 | ||
20 | 20 | ||