diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-11 06:17:01 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:03:16 -0400 |
commit | 65155b3708137fabee865dc4da822763c0c41208 (patch) | |
tree | dba5ac1c56a96650733f21a820dde26215fa2fb4 | |
parent | 85dd08ebf1d208c391c48243e30e286808f684d8 (diff) |
fix typos concerning "management"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smscoreapi.c | 2 | ||||
-rw-r--r-- | drivers/net/benet/be_hw.h | 2 | ||||
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 4 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 2 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 | ||||
-rw-r--r-- | drivers/scsi/pm8001/pm8001_hwi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.h | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 2 | ||||
-rw-r--r-- | include/linux/if_link.h | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index f8fbbc67a406..7745394c3e63 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
@@ -1013,7 +1013,7 @@ int vmw_gmr_id_alloc(struct vmw_private *dev_priv, uint32_t *p_id) | |||
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | /* | 1015 | /* |
1016 | * Stream managment | 1016 | * Stream management |
1017 | */ | 1017 | */ |
1018 | 1018 | ||
1019 | static void vmw_stream_destroy(struct vmw_resource *res) | 1019 | static void vmw_stream_destroy(struct vmw_resource *res) |
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index 0c87a3c3899a..a19f649666d5 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
@@ -1297,7 +1297,7 @@ int smsclient_sendrequest(struct smscore_client_t *client, | |||
1297 | EXPORT_SYMBOL_GPL(smsclient_sendrequest); | 1297 | EXPORT_SYMBOL_GPL(smsclient_sendrequest); |
1298 | 1298 | ||
1299 | 1299 | ||
1300 | /* old GPIO managments implementation */ | 1300 | /* old GPIO managements implementation */ |
1301 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, | 1301 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, |
1302 | struct smscore_config_gpio *pinconfig) | 1302 | struct smscore_config_gpio *pinconfig) |
1303 | { | 1303 | { |
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h index 063026de4957..3f1b7c3965bb 100644 --- a/drivers/net/benet/be_hw.h +++ b/drivers/net/benet/be_hw.h | |||
@@ -52,7 +52,7 @@ | |||
52 | */ | 52 | */ |
53 | #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ | 53 | #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ |
54 | 54 | ||
55 | /********* Power managment (WOL) **********/ | 55 | /********* Power management (WOL) **********/ |
56 | #define PCICFG_PM_CONTROL_OFFSET 0x44 | 56 | #define PCICFG_PM_CONTROL_OFFSET 0x44 |
57 | #define PCICFG_PM_CONTROL_MASK 0x108 /* bits 3 & 8 */ | 57 | #define PCICFG_PM_CONTROL_MASK 0x108 /* bits 3 & 8 */ |
58 | 58 | ||
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 9276121db1ef..bc39542481a4 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -2452,7 +2452,7 @@ module_exit(fcoe_exit); | |||
2452 | * @fp: response frame, or error encoded in a pointer (timeout) | 2452 | * @fp: response frame, or error encoded in a pointer (timeout) |
2453 | * @arg: pointer the the fcoe_ctlr structure | 2453 | * @arg: pointer the the fcoe_ctlr structure |
2454 | * | 2454 | * |
2455 | * This handles MAC address managment for FCoE, then passes control on to | 2455 | * This handles MAC address management for FCoE, then passes control on to |
2456 | * the libfc FLOGI response handler. | 2456 | * the libfc FLOGI response handler. |
2457 | */ | 2457 | */ |
2458 | static void fcoe_flogi_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg) | 2458 | static void fcoe_flogi_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg) |
@@ -2484,7 +2484,7 @@ done: | |||
2484 | * @fp: response frame, or error encoded in a pointer (timeout) | 2484 | * @fp: response frame, or error encoded in a pointer (timeout) |
2485 | * @arg: pointer the the fcoe_ctlr structure | 2485 | * @arg: pointer the the fcoe_ctlr structure |
2486 | * | 2486 | * |
2487 | * This handles MAC address managment for FCoE, then passes control on to | 2487 | * This handles MAC address management for FCoE, then passes control on to |
2488 | * the libfc LOGO response handler. | 2488 | * the libfc LOGO response handler. |
2489 | */ | 2489 | */ |
2490 | static void fcoe_logo_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg) | 2490 | static void fcoe_logo_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg) |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index b4afe431ac1e..41c29a86e834 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -474,7 +474,7 @@ typedef void (*MPT_ADD_SGE)(void *paddr, u32 flags_length, dma_addr_t dma_addr); | |||
474 | * @shost_recovery: host reset in progress | 474 | * @shost_recovery: host reset in progress |
475 | * @ioc_reset_in_progress_lock: | 475 | * @ioc_reset_in_progress_lock: |
476 | * @ioc_link_reset_in_progress: phy/hard reset in progress | 476 | * @ioc_link_reset_in_progress: phy/hard reset in progress |
477 | * @ignore_loginfos: ignore loginfos during task managment | 477 | * @ignore_loginfos: ignore loginfos during task management |
478 | * @remove_host: flag for when driver unloads, to avoid sending dev resets | 478 | * @remove_host: flag for when driver unloads, to avoid sending dev resets |
479 | * @wait_for_port_enable_to_complete: | 479 | * @wait_for_port_enable_to_complete: |
480 | * @msix_enable: flag indicating msix is enabled | 480 | * @msix_enable: flag indicating msix is enabled |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index c5ff26a2a51d..06d645a36f1b 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -2979,7 +2979,7 @@ _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *)) | |||
2979 | /* host recovery or link resets sent via IOCTLs */ | 2979 | /* host recovery or link resets sent via IOCTLs */ |
2980 | if (ioc->shost_recovery || ioc->ioc_link_reset_in_progress) | 2980 | if (ioc->shost_recovery || ioc->ioc_link_reset_in_progress) |
2981 | return SCSI_MLQUEUE_HOST_BUSY; | 2981 | return SCSI_MLQUEUE_HOST_BUSY; |
2982 | /* device busy with task managment */ | 2982 | /* device busy with task management */ |
2983 | else if (sas_device_priv_data->block || sas_target_priv_data->tm_busy) | 2983 | else if (sas_device_priv_data->block || sas_target_priv_data->tm_busy) |
2984 | return SCSI_MLQUEUE_DEVICE_BUSY; | 2984 | return SCSI_MLQUEUE_DEVICE_BUSY; |
2985 | /* device has been deleted */ | 2985 | /* device has been deleted */ |
@@ -6845,7 +6845,7 @@ _scsih_init(void) | |||
6845 | /* queuecommand callback hander */ | 6845 | /* queuecommand callback hander */ |
6846 | scsi_io_cb_idx = mpt2sas_base_register_callback_handler(_scsih_io_done); | 6846 | scsi_io_cb_idx = mpt2sas_base_register_callback_handler(_scsih_io_done); |
6847 | 6847 | ||
6848 | /* task managment callback handler */ | 6848 | /* task management callback handler */ |
6849 | tm_cb_idx = mpt2sas_base_register_callback_handler(_scsih_tm_done); | 6849 | tm_cb_idx = mpt2sas_base_register_callback_handler(_scsih_tm_done); |
6850 | 6850 | ||
6851 | /* base internal commands callback handler */ | 6851 | /* base internal commands callback handler */ |
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 5ff8261c5d67..0e05e8a22167 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c | |||
@@ -4152,7 +4152,7 @@ static int pm8001_chip_abort_task(struct pm8001_hba_info *pm8001_ha, | |||
4152 | } | 4152 | } |
4153 | 4153 | ||
4154 | /** | 4154 | /** |
4155 | * pm8001_chip_ssp_tm_req - built the task managment command. | 4155 | * pm8001_chip_ssp_tm_req - built the task management command. |
4156 | * @pm8001_ha: our hba card information. | 4156 | * @pm8001_ha: our hba card information. |
4157 | * @ccb: the ccb information. | 4157 | * @ccb: the ccb information. |
4158 | * @tmf: task management function. | 4158 | * @tmf: task management function. |
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 8ef945365412..782b30d0eea1 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
@@ -1129,7 +1129,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, | |||
1129 | cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32( | 1129 | cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32( |
1130 | MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF)); | 1130 | MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF)); |
1131 | fcp_cmnd->task_attribute = 0; | 1131 | fcp_cmnd->task_attribute = 0; |
1132 | fcp_cmnd->task_managment = 0; | 1132 | fcp_cmnd->task_management = 0; |
1133 | 1133 | ||
1134 | cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */ | 1134 | cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */ |
1135 | 1135 | ||
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h index f8f99a5ea532..1b44d013f151 100644 --- a/drivers/scsi/qla2xxx/qla_nx.h +++ b/drivers/scsi/qla2xxx/qla_nx.h | |||
@@ -832,7 +832,7 @@ struct fcp_cmnd { | |||
832 | struct scsi_lun lun; | 832 | struct scsi_lun lun; |
833 | uint8_t crn; | 833 | uint8_t crn; |
834 | uint8_t task_attribute; | 834 | uint8_t task_attribute; |
835 | uint8_t task_managment; | 835 | uint8_t task_management; |
836 | uint8_t additional_cdb_len; | 836 | uint8_t additional_cdb_len; |
837 | uint8_t cdb[260]; /* 256 for CDB len and 4 for FCP_DL */ | 837 | uint8_t cdb[260]; /* 256 for CDB len and 4 for FCP_DL */ |
838 | }; | 838 | }; |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 3239d1c10acb..c2c598ed4eed 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -458,7 +458,7 @@ enum { | |||
458 | IDE_DFLAG_DOORLOCKING = (1 << 15), | 458 | IDE_DFLAG_DOORLOCKING = (1 << 15), |
459 | /* disallow DMA */ | 459 | /* disallow DMA */ |
460 | IDE_DFLAG_NODMA = (1 << 16), | 460 | IDE_DFLAG_NODMA = (1 << 16), |
461 | /* powermanagment told us not to do anything, so sleep nicely */ | 461 | /* powermanagement told us not to do anything, so sleep nicely */ |
462 | IDE_DFLAG_BLOCKED = (1 << 17), | 462 | IDE_DFLAG_BLOCKED = (1 << 17), |
463 | /* sleeping & sleep field valid */ | 463 | /* sleeping & sleep field valid */ |
464 | IDE_DFLAG_SLEEPING = (1 << 18), | 464 | IDE_DFLAG_SLEEPING = (1 << 18), |
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 85c812db5a3f..9d8f0807daed 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
@@ -233,7 +233,7 @@ enum macvlan_mode { | |||
233 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ | 233 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ |
234 | }; | 234 | }; |
235 | 235 | ||
236 | /* SR-IOV virtual function managment section */ | 236 | /* SR-IOV virtual function management section */ |
237 | 237 | ||
238 | enum { | 238 | enum { |
239 | IFLA_VF_INFO_UNSPEC, | 239 | IFLA_VF_INFO_UNSPEC, |