aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/paride/pcd.c4
-rw-r--r--drivers/crypto/qat/qat_common/adf_ctl_drv.c2
-rw-r--r--drivers/gpu/drm/i915/intel_bios.c2
-rw-r--r--drivers/i2c/busses/Kconfig2
-rw-r--r--drivers/i2c/busses/i2c-s3c2410.c2
-rw-r--r--drivers/infiniband/hw/ocrdma/ocrdma_verbs.c2
-rw-r--r--drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c2
-rw-r--r--drivers/irqchip/Kconfig2
-rw-r--r--drivers/media/i2c/cx25840/cx25840-ir.c2
-rw-r--r--drivers/media/pci/cx23885/cx23888-ir.c2
-rw-r--r--drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c2
-rw-r--r--drivers/misc/mei/pci-me.c4
-rw-r--r--drivers/misc/mei/pci-txe.c4
-rw-r--r--drivers/net/bonding/bond_sysfs_slave.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/cmd.c4
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c2
-rw-r--r--drivers/net/ethernet/via/via-velocity.c2
-rw-r--r--drivers/net/wireless/libertas/cfg.c2
-rw-r--r--drivers/net/wireless/libertas_tf/main.c2
-rw-r--r--drivers/platform/x86/Kconfig4
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic79xx2
-rw-r--r--drivers/scsi/fnic/fnic_debugfs.c2
-rw-r--r--drivers/scsi/fnic/fnic_trace.c2
-rw-r--r--drivers/scsi/nsp32.c2
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_nx2.c2
-rw-r--r--drivers/usb/host/Kconfig2
-rw-r--r--drivers/video/backlight/88pm860x_bl.c2
29 files changed, 34 insertions, 34 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 719cb1bc1640..3b7c9f1be484 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -69,8 +69,8 @@
69 nice This parameter controls the driver's use of 69 nice This parameter controls the driver's use of
70 idle CPU time, at the expense of some speed. 70 idle CPU time, at the expense of some speed.
71 71
72 If this driver is built into the kernel, you can use kernel 72 If this driver is built into the kernel, you can use the
73 the following command line parameters, with the same values 73 following kernel command line parameters, with the same values
74 as the corresponding module parameters listed above: 74 as the corresponding module parameters listed above:
75 75
76 pcd.drive0 76 pcd.drive0
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index d97069b8a8e4..6a92284a86b2 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -436,7 +436,7 @@ static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
436 ret = adf_ctl_ioctl_get_status(fp, cmd, arg); 436 ret = adf_ctl_ioctl_get_status(fp, cmd, arg);
437 break; 437 break;
438 default: 438 default:
439 pr_err("QAT: Invalid ioclt\n"); 439 pr_err("QAT: Invalid ioctl\n");
440 ret = -EFAULT; 440 ret = -EFAULT;
441 break; 441 break;
442 } 442 }
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index eee79e1c3222..afcc8dd40bdd 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -946,7 +946,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
946 DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", 946 DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n",
947 port_name(port)); 947 port_name(port));
948 if (is_dvi && (port == PORT_A || port == PORT_E)) 948 if (is_dvi && (port == PORT_A || port == PORT_E))
949 DRM_DEBUG_KMS("Port %c is TMDS compabile\n", port_name(port)); 949 DRM_DEBUG_KMS("Port %c is TMDS compatible\n", port_name(port));
950 if (!is_dvi && !is_dp && !is_crt) 950 if (!is_dvi && !is_dp && !is_crt)
951 DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", 951 DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n",
952 port_name(port)); 952 port_name(port));
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2ac87fa3058d..2e45ae3796f1 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -357,7 +357,7 @@ config I2C_BCM_KONA
357 If you say yes to this option, support will be included for the 357 If you say yes to this option, support will be included for the
358 I2C interface on the Broadcom Kona family of processors. 358 I2C interface on the Broadcom Kona family of processors.
359 359
360 If you do not need KONA I2C inteface, say N. 360 If you do not need KONA I2C interface, say N.
361 361
362config I2C_BLACKFIN_TWI 362config I2C_BLACKFIN_TWI
363 tristate "Blackfin TWI I2C support" 363 tristate "Blackfin TWI I2C support"
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index e086fb075f2b..e3b0337faeb7 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -244,7 +244,7 @@ static bool is_ack(struct s3c24xx_i2c *i2c)
244 } 244 }
245 usleep_range(1000, 2000); 245 usleep_range(1000, 2000);
246 } 246 }
247 dev_err(i2c->dev, "ack was not recieved\n"); 247 dev_err(i2c->dev, "ack was not received\n");
248 return false; 248 return false;
249} 249}
250 250
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 8f5f2577f288..e8b8569788c0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1870,7 +1870,7 @@ static int ocrdma_build_inline_sges(struct ocrdma_qp *qp,
1870 hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge); 1870 hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge);
1871 if (unlikely(hdr->total_len > qp->max_inline_data)) { 1871 if (unlikely(hdr->total_len > qp->max_inline_data)) {
1872 pr_err("%s() supported_len=0x%x,\n" 1872 pr_err("%s() supported_len=0x%x,\n"
1873 " unspported len req=0x%x\n", __func__, 1873 " unsupported len req=0x%x\n", __func__,
1874 qp->max_inline_data, hdr->total_len); 1874 qp->max_inline_data, hdr->total_len);
1875 return -EINVAL; 1875 return -EINVAL;
1876 } 1876 }
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
index f8dfd76be89f..db3588df3546 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
@@ -511,7 +511,7 @@ int usnic_ib_qp_grp_modify(struct usnic_ib_qp_grp *qp_grp,
511 usnic_ib_qp_grp_state_to_string(old_state), 511 usnic_ib_qp_grp_state_to_string(old_state),
512 usnic_ib_qp_grp_state_to_string(new_state)); 512 usnic_ib_qp_grp_state_to_string(new_state));
513 } else { 513 } else {
514 usnic_err("Failed to transistion %u from %s to %s", 514 usnic_err("Failed to transition %u from %s to %s",
515 qp_grp->grp_id, 515 qp_grp->grp_id,
516 usnic_ib_qp_grp_state_to_string(old_state), 516 usnic_ib_qp_grp_state_to_string(old_state),
517 usnic_ib_qp_grp_state_to_string(new_state)); 517 usnic_ib_qp_grp_state_to_string(new_state));
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index b8632bf9a7f3..a31a9e40eed9 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -109,7 +109,7 @@ config XTENSA_MX
109config IRQ_CROSSBAR 109config IRQ_CROSSBAR
110 bool 110 bool
111 help 111 help
112 Support for a CROSSBAR ip that preceeds the main interrupt controller. 112 Support for a CROSSBAR ip that precedes the main interrupt controller.
113 The primary irqchip invokes the crossbar's callback which inturn allocates 113 The primary irqchip invokes the crossbar's callback which inturn allocates
114 a free irq and configures the IP. Thus the peripheral interrupts are 114 a free irq and configures the IP. Thus the peripheral interrupts are
115 routed to one of the free irqchip interrupt lines. 115 routed to one of the free irqchip interrupt lines.
diff --git a/drivers/media/i2c/cx25840/cx25840-ir.c b/drivers/media/i2c/cx25840/cx25840-ir.c
index e6588ee5bdb0..4cf8f18bf097 100644
--- a/drivers/media/i2c/cx25840/cx25840-ir.c
+++ b/drivers/media/i2c/cx25840/cx25840-ir.c
@@ -224,7 +224,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
224} 224}
225 225
226/* 226/*
227 * FIFO register pulse width count compuations 227 * FIFO register pulse width count computations
228 */ 228 */
229static u32 clock_divider_to_resolution(u16 divider) 229static u32 clock_divider_to_resolution(u16 divider)
230{ 230{
diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c
index 2c951dec2d33..c2ff5fc01157 100644
--- a/drivers/media/pci/cx23885/cx23888-ir.c
+++ b/drivers/media/pci/cx23885/cx23888-ir.c
@@ -263,7 +263,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
263} 263}
264 264
265/* 265/*
266 * FIFO register pulse width count compuations 266 * FIFO register pulse width count computations
267 */ 267 */
268static u32 clock_divider_to_resolution(u16 divider) 268static u32 clock_divider_to_resolution(u16 divider)
269{ 269{
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
index e60cbb3aa609..f86cec091bf4 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
@@ -259,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
259 fine = val % VV6410_CIF_LINELENGTH; 259 fine = val % VV6410_CIF_LINELENGTH;
260 coarse = min(512, val / VV6410_CIF_LINELENGTH); 260 coarse = min(512, val / VV6410_CIF_LINELENGTH);
261 261
262 PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d", 262 PDEBUG(D_CONF, "Set coarse exposure to %d, fine exposure to %d",
263 coarse, fine); 263 coarse, fine);
264 264
265 err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); 265 err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8);
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index a0e9422b55a2..959c313d84a7 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -424,7 +424,7 @@ static int mei_me_pm_runtime_resume(struct device *device)
424} 424}
425 425
426/** 426/**
427 * mei_me_set_pm_domain - fill and set pm domian stucture for device 427 * mei_me_set_pm_domain - fill and set pm domain structure for device
428 * 428 *
429 * @dev: mei_device 429 * @dev: mei_device
430 */ 430 */
@@ -444,7 +444,7 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev)
444} 444}
445 445
446/** 446/**
447 * mei_me_unset_pm_domain - clean pm domian stucture for device 447 * mei_me_unset_pm_domain - clean pm domain structure for device
448 * 448 *
449 * @dev: mei_device 449 * @dev: mei_device
450 */ 450 */
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c
index 19de57368b7a..74727dda51c1 100644
--- a/drivers/misc/mei/pci-txe.c
+++ b/drivers/misc/mei/pci-txe.c
@@ -371,7 +371,7 @@ static int mei_txe_pm_runtime_resume(struct device *device)
371} 371}
372 372
373/** 373/**
374 * mei_txe_set_pm_domain - fill and set pm domian stucture for device 374 * mei_txe_set_pm_domain - fill and set pm domain structure for device
375 * 375 *
376 * @dev: mei_device 376 * @dev: mei_device
377 */ 377 */
@@ -391,7 +391,7 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev)
391} 391}
392 392
393/** 393/**
394 * mei_txe_unset_pm_domain - clean pm domian stucture for device 394 * mei_txe_unset_pm_domain - clean pm domain structure for device
395 * 395 *
396 * @dev: mei_device 396 * @dev: mei_device
397 */ 397 */
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c
index 5cd532ca1cfe..b01b0ce4d1be 100644
--- a/drivers/net/bonding/bond_sysfs_slave.c
+++ b/drivers/net/bonding/bond_sysfs_slave.c
@@ -36,7 +36,7 @@ static ssize_t state_show(struct slave *slave, char *buf)
36 case BOND_STATE_BACKUP: 36 case BOND_STATE_BACKUP:
37 return sprintf(buf, "backup\n"); 37 return sprintf(buf, "backup\n");
38 default: 38 default:
39 return sprintf(buf, "UNKONWN\n"); 39 return sprintf(buf, "UNKNOWN\n");
40 } 40 }
41} 41}
42static SLAVE_ATTR_RO(state); 42static SLAVE_ATTR_RO(state);
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 02a2e90d581a..923c4878461e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1695,7 +1695,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
1695 if (err) { 1695 if (err) {
1696 vp_oper->vlan_idx = NO_INDX; 1696 vp_oper->vlan_idx = NO_INDX;
1697 mlx4_warn(&priv->dev, 1697 mlx4_warn(&priv->dev,
1698 "No vlan resorces slave %d, port %d\n", 1698 "No vlan resources slave %d, port %d\n",
1699 slave, port); 1699 slave, port);
1700 return err; 1700 return err;
1701 } 1701 }
@@ -1711,7 +1711,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
1711 err = vp_oper->mac_idx; 1711 err = vp_oper->mac_idx;
1712 vp_oper->mac_idx = NO_INDX; 1712 vp_oper->mac_idx = NO_INDX;
1713 mlx4_warn(&priv->dev, 1713 mlx4_warn(&priv->dev,
1714 "No mac resorces slave %d, port %d\n", 1714 "No mac resources slave %d, port %d\n",
1715 slave, port); 1715 slave, port);
1716 return err; 1716 return err;
1717 } 1717 }
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index db4280ce9c09..716fc37ada5a 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -922,7 +922,7 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd)
922 922
923 rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); 923 rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
924 if (rv != 0) { 924 if (rv != 0) {
925 printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n", 925 printk(KERN_ERR "%s: could not notify %s IP 0x%x request\n",
926 adapter->netdev->name, 926 adapter->netdev->name,
927 (cmd == NX_IP_UP) ? "Add" : "Remove", ip); 927 (cmd == NX_IP_UP) ? "Add" : "Remove", ip);
928 } 928 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 851cb4a80d50..03cd4c3d7835 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -941,7 +941,7 @@ void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter,
941 rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); 941 rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
942 if (rv != 0) 942 if (rv != 0)
943 dev_err(&adapter->netdev->dev, 943 dev_err(&adapter->netdev->dev,
944 "could not notify %s IP 0x%x reuqest\n", 944 "could not notify %s IP 0x%x request\n",
945 (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); 945 (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip);
946} 946}
947 947
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index f5fbc12d3e10..a43e8492b1ce 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2056,7 +2056,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
2056 struct sk_buff *skb; 2056 struct sk_buff *skb;
2057 2057
2058 if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { 2058 if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) {
2059 VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame span multple RDs.\n", vptr->netdev->name); 2059 VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame spans multiple RDs.\n", vptr->netdev->name);
2060 stats->rx_length_errors++; 2060 stats->rx_length_errors++;
2061 return -EINVAL; 2061 return -EINVAL;
2062 } 2062 }
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 47a998d8f99e..40ab7f0b7be0 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1353,7 +1353,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
1353 wait_event_interruptible_timeout(priv->scan_q, 1353 wait_event_interruptible_timeout(priv->scan_q,
1354 (priv->scan_req == NULL), 1354 (priv->scan_req == NULL),
1355 (15 * HZ)); 1355 (15 * HZ));
1356 lbs_deb_assoc("assoc: scanning competed\n"); 1356 lbs_deb_assoc("assoc: scanning completed\n");
1357 } 1357 }
1358 1358
1359 /* Find the BSS we want using available scan results */ 1359 /* Find the BSS we want using available scan results */
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 088de9d25c39..25c5acc78bd1 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -332,7 +332,7 @@ static int lbtf_op_start(struct ieee80211_hw *hw)
332 332
333err_prog_firmware: 333err_prog_firmware:
334 priv->hw_reset_device(card); 334 priv->hw_reset_device(card);
335 lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programing fw; ret=%d", ret); 335 lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programming fw; ret=%d", ret);
336 return ret; 336 return ret;
337} 337}
338 338
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 3bbcbf12c1fb..4dcfb7116a04 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -540,7 +540,7 @@ config ASUS_NB_WMI
540 This is a driver for newer Asus notebooks. It adds extra features 540 This is a driver for newer Asus notebooks. It adds extra features
541 like wireless radio and bluetooth control, leds, hotkeys, backlight... 541 like wireless radio and bluetooth control, leds, hotkeys, backlight...
542 542
543 For more informations, see 543 For more information, see
544 <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> 544 <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
545 545
546 If you have an ACPI-WMI compatible Asus Notebook, say Y or M 546 If you have an ACPI-WMI compatible Asus Notebook, say Y or M
@@ -553,7 +553,7 @@ config EEEPC_WMI
553 This is a driver for newer Eee PC laptops. It adds extra features 553 This is a driver for newer Eee PC laptops. It adds extra features
554 like wireless radio and bluetooth control, leds, hotkeys, backlight... 554 like wireless radio and bluetooth control, leds, hotkeys, backlight...
555 555
556 For more informations, see 556 For more information, see
557 <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> 557 <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
558 558
559 If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M 559 If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 6739069477de..3b3d599103f8 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -70,7 +70,7 @@ config AIC79XX_DEBUG_MASK
70 default "0" 70 default "0"
71 help 71 help
72 Bit mask of debug options that is only valid if the 72 Bit mask of debug options that is only valid if the
73 CONFIG_AIC79XX_DEBUG_ENBLE option is enabled. The bits in this mask 73 CONFIG_AIC79XX_DEBUG_ENABLE option is enabled. The bits in this mask
74 are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the 74 are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the
75 variable ahd_debug in that file to find them. 75 variable ahd_debug in that file to find them.
76 76
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index 2c613bdea78f..5980c10c734d 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -210,7 +210,7 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp,
210 else if (*trace_type == fc_trc_flag->fc_clear) 210 else if (*trace_type == fc_trc_flag->fc_clear)
211 fnic_fc_trace_cleared = val; 211 fnic_fc_trace_cleared = val;
212 else 212 else
213 pr_err("fnic: cannot write to any debufs file\n"); 213 pr_err("fnic: cannot write to any debugfs file\n");
214 214
215 (*ppos)++; 215 (*ppos)++;
216 216
diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c
index c77285926827..8b1b38751b49 100644
--- a/drivers/scsi/fnic/fnic_trace.c
+++ b/drivers/scsi/fnic/fnic_trace.c
@@ -592,7 +592,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type,
592 592
593 if (fnic_fc_trace_cleared == 1) { 593 if (fnic_fc_trace_cleared == 1) {
594 fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0; 594 fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0;
595 pr_info("fnic: Reseting the read idx\n"); 595 pr_info("fnic: Resetting the read idx\n");
596 memset((void *)fnic_fc_ctlr_trace_buf_p, 0, 596 memset((void *)fnic_fc_ctlr_trace_buf_p, 0,
597 fnic_fc_trace_max_pages * PAGE_SIZE); 597 fnic_fc_trace_max_pages * PAGE_SIZE);
598 fnic_fc_trace_cleared = 0; 598 fnic_fc_trace_cleared = 0;
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 50b086aef178..53284eb23a15 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -930,7 +930,7 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct s
930 930
931 /* check target ID is not same as this initiator ID */ 931 /* check target ID is not same as this initiator ID */
932 if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { 932 if (scmd_id(SCpnt) == SCpnt->device->host->this_id) {
933 nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "terget==host???"); 933 nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "target==host???");
934 SCpnt->result = DID_BAD_TARGET << 16; 934 SCpnt->result = DID_BAD_TARGET << 16;
935 done(SCpnt); 935 done(SCpnt);
936 return 0; 936 return 0;
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 340ceff03823..34aad32829f5 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -533,7 +533,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask,
533 } while ((--time_out != 0) && (reg & mask) != 0); 533 } while ((--time_out != 0) && (reg & mask) != 0);
534 534
535 if (time_out == 0) { 535 if (time_out == 0) {
536 nsp_msg(KERN_DEBUG, " %s signal off timeut", str); 536 nsp_msg(KERN_DEBUG, " %s signal off timeout", str);
537 } 537 }
538 538
539 return 0; 539 return 0;
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index da9e3902f219..24a852828b5d 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -399,7 +399,7 @@ qla8044_idc_lock(struct qla_hw_data *ha)
399 */ 399 */
400 ql_dbg(ql_dbg_p3p, vha, 0xb08a, 400 ql_dbg(ql_dbg_p3p, vha, 0xb08a,
401 "%s: IDC lock Recovery by %d " 401 "%s: IDC lock Recovery by %d "
402 "failed, Retrying timout\n", __func__, 402 "failed, Retrying timeout\n", __func__,
403 ha->portnum); 403 ha->portnum);
404 timeout = 0; 404 timeout = 0;
405 } 405 }
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 82800a775501..56f4336ffa86 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -126,7 +126,7 @@ config XPS_USB_HCD_XILINX
126 select USB_EHCI_BIG_ENDIAN_DESC 126 select USB_EHCI_BIG_ENDIAN_DESC
127 select USB_EHCI_BIG_ENDIAN_MMIO 127 select USB_EHCI_BIG_ENDIAN_MMIO
128 ---help--- 128 ---help---
129 Xilinx xps USB host controller core is EHCI compilant and has 129 Xilinx xps USB host controller core is EHCI compliant and has
130 transaction translator built-in. It can be configured to either 130 transaction translator built-in. It can be configured to either
131 support both high speed and full speed devices, or high speed 131 support both high speed and full speed devices, or high speed
132 devices only. 132 devices only.
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 7db5234462d0..a6f7cc0a0883 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -216,7 +216,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
216 data->reg_duty_cycle = res->start; 216 data->reg_duty_cycle = res->start;
217 res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); 217 res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on");
218 if (!res) { 218 if (!res) {
219 dev_err(&pdev->dev, "No REG resorce for always on\n"); 219 dev_err(&pdev->dev, "No REG resource for always on\n");
220 return -ENXIO; 220 return -ENXIO;
221 } 221 }
222 data->reg_always_on = res->start; 222 data->reg_always_on = res->start;