[adm5120] switch to 2.6.25.7

[openwrt.git] / target / linux / adm5120 / files / drivers / mtd / myloader.c

diff --git a/target/linux/adm5120/files/drivers/mtd/myloader.c b/target/linux/adm5120/files/drivers/mtd/myloader.c
index ad207e5..9dab9d1 100644 (file)
--- a/target/linux/adm5120/files/drivers/mtd/myloader.c
+++ b/target/linux/adm5120/files/drivers/mtd/myloader.c
@@ -10,20 +10,10 @@
  *  This file was based on drivers/mtd/redboot.c
  *  Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com>
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
  */
 
 #include <linux/kernel.h>
@@ -54,7 +44,6 @@ int parse_myloader_partitions(struct mtd_info *master,
        int num_parts;
        int ret, i;
        size_t retlen;
-       size_t parts_len;
        char *names;
        unsigned long offset;
        unsigned long blocklen;
@@ -104,8 +93,8 @@ int parse_myloader_partitions(struct mtd_info *master,
                num_parts++;
        }
 
-       mtd_parts = kzalloc((num_parts*sizeof(*mtd_part) + num_parts*NAME_LEN_MAX),
-                        GFP_KERNEL);
+       mtd_parts = kzalloc((num_parts * sizeof(*mtd_part) +
+                               num_parts * NAME_LEN_MAX), GFP_KERNEL);
 
        if (!mtd_parts) {
                ret = -ENOMEM;
@@ -175,4 +164,4 @@ module_exit(mylo_mtd_parser_exit);
 
 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
 MODULE_DESCRIPTION("Parsing code for MyLoader partition tables");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");