diff options
| author | Greg Kroah-Hartman | 2011-04-13 21:14:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-13 21:14:05 +0200 |
| commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
| tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/gma500 | |
| parent | staging: IIO: DAC: New driver for the AD5504 and AD55041 High Voltage DACs (diff) | |
| parent | Linux 2.6.39-rc3 (diff) | |
| download | kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.xz kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.zip | |
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_bios.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_sdvo.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_sdvo_regs.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index 05c31b9b43fc..711e5a997c95 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -556,7 +556,7 @@ static int psb_driver_unload(struct drm_device *dev) kfree(dev_priv); dev->dev_private = NULL; - /*destory VBT data*/ + /*destroy VBT data*/ psb_intel_destroy_bios(dev); } diff --git a/drivers/staging/gma500/psb_intel_bios.c b/drivers/staging/gma500/psb_intel_bios.c index f5bcd119b87d..48ac8ba7f40b 100644 --- a/drivers/staging/gma500/psb_intel_bios.c +++ b/drivers/staging/gma500/psb_intel_bios.c @@ -271,7 +271,7 @@ bool psb_intel_init_bios(struct drm_device *dev) } /** - * Destory and free VBT data + * Destroy and free VBT data */ void psb_intel_destroy_bios(struct drm_device *dev) { diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c index d005227b95d2..df1c006ecfaa 100644 --- a/drivers/staging/gma500/psb_intel_sdvo.c +++ b/drivers/staging/gma500/psb_intel_sdvo.c @@ -573,7 +573,7 @@ static bool psb_sdvo_set_current_inoutmap(struct psb_intel_output *output, /* Make all fields of the args/ret to zero */ memset(byArgs, 0, sizeof(byArgs)); - /* Fill up the arguement values; */ + /* Fill up the argument values; */ byArgs[0] = (u8) (in0outputmask & 0xFF); byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF); byArgs[2] = (u8) (in1outputmask & 0xFF); diff --git a/drivers/staging/gma500/psb_intel_sdvo_regs.h b/drivers/staging/gma500/psb_intel_sdvo_regs.h index a1d1475a9315..c7107a37e33d 100644 --- a/drivers/staging/gma500/psb_intel_sdvo_regs.h +++ b/drivers/staging/gma500/psb_intel_sdvo_regs.h @@ -217,7 +217,7 @@ struct psb_intel_sdvo_set_target_input_args { } __attribute__ ((packed)); /** - * Takes a struct psb_intel_sdvo_output_flags of which outputs are targetted by + * Takes a struct psb_intel_sdvo_output_flags of which outputs are targeted by * future output commands. * * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12], |