Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[pandora-kernel.git] / arch / arm / mm / cache-l2x0.c

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 5ea2d6d..c6c7696 100644 (file)
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mm/cache-l2x0.c - L210/L220 cache controller support
+ * arch/arm/mm/cache-l2x0.c - L210/L220/L310 cache controller support
  *
  * Copyright (C) 2007 ARM Limited
  *
@@ -950,7 +950,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np,
        /* All these l2 caches have the same line = block size actually */
        if (!line_size) {
                if (block_size) {
-                       /* If linesize if not given, it is equal to blocksize */
+                       /* If linesize is not given, it is equal to blocksize */
                        line_size = block_size;
                } else {
                        /* Fall back to known size */