Merge branch 'for-3.13/logitech' into for-next

[karo-tx-linux.git] / arch / mips / powertv / asic / prealloc-cronus.c

diff --git a/arch/mips/powertv/asic/prealloc-cronus.c b/arch/mips/powertv/asic/prealloc-cronus.c
index c532b50521ec5e25d2e37e521caa2fb2f5a4730a..7c6ce75969357eeea546d2cecea41553e70966d3 100644 (file)
--- a/arch/mips/powertv/asic/prealloc-cronus.c
+++ b/arch/mips/powertv/asic/prealloc-cronus.c
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * Author:       Ken Eppinett
- *               David Schleef <ds@schleef.org>
+ * Author:      Ken Eppinett
+ *              David Schleef <ds@schleef.org>
  */
 
 #include <linux/init.h>
@@ -78,7 +78,7 @@ struct resource dvr_cronus_resources[] __initdata =
         *
         *  This memory area is used for allocating buffers for Video decoding
         *  purposes.  Allocation/De-allocation within this buffer is managed
-        *  by the STAVMEM driver of the STAPI.  They could be Decimated
+        *  by the STAVMEM driver of the STAPI.  They could be Decimated
         *  Picture Buffers, Intermediate Buffers, as deemed necessary for
         *  video decoding purposes, for any video decoders on Zeus.
         */
@@ -185,7 +185,7 @@ struct resource dvr_cronus_resources[] __initdata =
         * End of Resource marker
         */
        {
-               .flags  = 0,
+               .flags  = 0,
        },
 };
 
@@ -241,7 +241,7 @@ struct resource non_dvr_cronus_resources[] __initdata =
         *
         *  This memory area is used for allocating buffers for Video decoding
         *  purposes.  Allocation/De-allocation within this buffer is managed
-        *  by the STAVMEM driver of the STAPI.  They could be Decimated
+        *  by the STAVMEM driver of the STAPI.  They could be Decimated
         *  Picture Buffers, Intermediate Buffers, as deemed necessary for
         *  video decoding purposes, for any video decoders on Zeus.
         */
@@ -335,6 +335,6 @@ struct resource non_dvr_cronus_resources[] __initdata =
         * End of Resource marker
         */
        {
-               .flags  = 0,
+               .flags  = 0,
        },
 };