diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/gma500/psb_intel_sdvo.c | |
parent | 59c23eabdae97a18cfc400339138f6d1dbde926a (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
download | op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.zip op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz |
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/psb_intel_sdvo.c')
-rw-r--r-- | drivers/staging/gma500/psb_intel_sdvo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c index d005227..df1c006 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); |