Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Hans de Goede <hdegoede@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

Hi,

On 03/15/2011 09:24 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/hwmon/sch5627.c: In function 'sch5627_read_virtual_reg':
> drivers/hwmon/sch5627.c:179: error: implicit declaration of function 'msleep'
>
> Caused by commit 19803daeb145 ("hwmon: New driver for SMSC SCH5627").
> See Rule 1 in Documentation/SubmitChecklist.
>
> I have reverted that commit for today.

The attached patch should fix this, Jean can you please add this to your
tree? Note feel free to merge it into the initial patch adding the sch5627 driver
if you prefer.

Thanks & Regards,

Hans

[-- Attachment #2: 0001-hwmon-sch5627-include-linux-delay.h-for-msleep-proto.patch --]
[-- Type: text/plain, Size: 799 bytes --]

>From a5ffc5ddcdb230fcb10fe6c80ebe043c25763416 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 15 Mar 2011 09:37:47 +0100
Subject: [PATCH] hwmon/sch5627: include linux/delay.h for msleep prototype

This should fix sch5627 breaking the building of linux-next

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hwmon/sch5627.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 0001331..9a51dcc 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -30,6 +30,7 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/acpi.h>
+#include <linux/delay.h>
 
 #define DRVNAME "sch5627"
 #define DEVNAME DRVNAME /* We only support one model */
-- 
1.7.3.2