aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/salinfo.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-17 08:23:04 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-17 08:23:04 -0400
commit5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch)
treebeba3ecc27c64e0c22b1a21201f1999afe9834f2 /arch/ia64/kernel/salinfo.c
parent55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff)
parentb2cd64153b94473f6bd82448a68b8e8c041676ea (diff)
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
-rw-r--r--arch/ia64/kernel/salinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 89f6b138a62..25cd75f50ab 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -162,7 +162,7 @@ static DEFINE_SPINLOCK(data_saved_lock);
/** salinfo_platform_oemdata - optional callback to decode oemdata from an error
* record.
* @sect_header: pointer to the start of the section to decode.
- * @oemdata: returns vmalloc area containing the decded output.
+ * @oemdata: returns vmalloc area containing the decoded output.
* @oemdata_size: returns length of decoded output (strlen).
*
* Description: If user space asks for oem data to be decoded by the kernel