ar71xx: wrt160nl_part: include module.h and fix compiler warnings

SVN-Revision: 29856
This commit is contained in:
Gabor Juhos 2012-01-22 17:55:38 +00:00
parent a7d344565b
commit e7dee3aeed

View file

@ -22,6 +22,7 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
@ -91,11 +92,15 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
struct uimage_header *uheader; struct uimage_header *uheader;
size_t retlen; size_t retlen;
unsigned int kernel_len; unsigned int kernel_len;
unsigned int uboot_len = max(master->erasesize, WRT160NL_UBOOT_LEN); unsigned int uboot_len;
unsigned int nvram_len = max(master->erasesize, WRT160NL_NVRAM_LEN); unsigned int nvram_len;
unsigned int art_len = max(master->erasesize, WRT160NL_ART_LEN); unsigned int art_len;
int ret; int ret;
uboot_len = max_t(unsigned int, master->erasesize, WRT160NL_UBOOT_LEN);
nvram_len = max_t(unsigned int, master->erasesize, WRT160NL_NVRAM_LEN);
art_len = max_t(unsigned int, master->erasesize, WRT160NL_ART_LEN);
header = vmalloc(sizeof(*header)); header = vmalloc(sizeof(*header));
if (!header) { if (!header) {
return -ENOMEM; return -ENOMEM;