From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 22 Jan 2012 17:55:38 +0000 (+0000)
Subject: ar71xx: wrt160nl_part: include module.h and fix compiler warnings
X-Git-Tag: fast2504n-3.10.28-merged~7249
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=acc9c3cbf50f87c98383d820ed7dc46d215756fa;p=openwrt.git

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29856 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
index eabb47e029..d979365d66 100644
--- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
+++ b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
@@ -91,11 +92,15 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
 	struct uimage_header *uheader;
 	size_t retlen;
 	unsigned int kernel_len;
-	unsigned int uboot_len = max(master->erasesize, WRT160NL_UBOOT_LEN);
-	unsigned int nvram_len = max(master->erasesize, WRT160NL_NVRAM_LEN);
-	unsigned int art_len = max(master->erasesize, WRT160NL_ART_LEN);
+	unsigned int uboot_len;
+	unsigned int nvram_len;
+	unsigned int art_len;
 	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));
 	if (!header) {
 		return -ENOMEM;