linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

After merging the staging tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hid/hid-sensor-hub.c: In function 'sensor_hub_probe':
drivers/hid/hid-sensor-hub.c:599:3: error: too few arguments to function 'mfd_add_devices'

Caused by commit 401ca24fb34a ("HID: sensors: introduce sensor
framework") interacting with commit 6607bad3d763 ("mfd: core: Push
irqdomain mapping out into devices") from the mfd tree.

I have added the following merge fix patch and can carry it as necessary
(no action is required).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 12 Sep 2012 16:03:55 +1000
Subject: [PATCH] HID: sensors: fix up for mfd_add_devices() API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/hid/hid-sensor-hub.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 34a35ba..4ac759c 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -596,7 +596,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
 		}
 	}
 	ret = mfd_add_devices(&hdev->dev, 0, sd->hid_sensor_hub_client_devs,
-		sd->hid_sensor_client_cnt, NULL, 0);
+		sd->hid_sensor_client_cnt, NULL, 0, NULL);
 	if (ret < 0)
 		goto err_free_names;
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature