Merge branch 'next' into for-linus

[mv-sheeva.git] / include / linux / cdk.h

diff --git a/include/linux/cdk.h b/include/linux/cdk.h
index 0908daf7bf56ffe63ec0bbe3e731b79e11d8bd8a..80093a8d4f64e51fb191295830001b414fec2fb4 100644 (file)
--- a/include/linux/cdk.h
+++ b/include/linux/cdk.h
@@ -149,7 +149,7 @@ typedef struct cdkhdr {
 /*
  *     Define the memory mapping structure. This structure is pointed to by
  *     the memp field in the stlcdkhdr struct. As many as these structures
- *     as required are layed out in shared memory to define how the rest of
+ *     as required are laid out in shared memory to define how the rest of
  *     shared memory is divided up. There will be one for each port.
  */
 typedef struct cdkmem {