From e6b8b05320d3fd75dbba7b9a5a8d6001dcf26f8d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 25 Nov 2011 00:23:28 +0100
Subject: [PATCH] --- yaml --- r: 276155 b: refs/heads/master c:
 97371fa99c1900a84a5220639edd726b35d73931 h: refs/heads/master i:   276153:
 ebd2928160afe82e1a3717ae53a1a4501780b5cd   276151:
 8e3a6f4c031aa813e6989974e8489d8780f7b764 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/i2c-nuc900.c | 2 +-
 trunk/drivers/spi/spi-nuc900.c        | 2 +-
 trunk/sound/soc/nuc900/nuc900-ac97.c  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8194572cc0cc..4b31def47605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46589e2922509f9134ce79fa75180886c9765c58
+refs/heads/master: 97371fa99c1900a84a5220639edd726b35d73931
diff --git a/trunk/drivers/i2c/busses/i2c-nuc900.c b/trunk/drivers/i2c/busses/i2c-nuc900.c
index 835e47b39bc2..03b615778887 100644
--- a/trunk/drivers/i2c/busses/i2c-nuc900.c
+++ b/trunk/drivers/i2c/busses/i2c-nuc900.c
@@ -593,7 +593,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
 	i2c->adap.algo_data = i2c;
 	i2c->adap.dev.parent = &pdev->dev;
 
-	mfp_set_groupg(&pdev->dev);
+	mfp_set_groupg(&pdev->dev, NULL);
 
 	clk_get_rate(i2c->clk);
 
diff --git a/trunk/drivers/spi/spi-nuc900.c b/trunk/drivers/spi/spi-nuc900.c
index e763254741c2..21c70b2b8311 100644
--- a/trunk/drivers/spi/spi-nuc900.c
+++ b/trunk/drivers/spi/spi-nuc900.c
@@ -426,7 +426,7 @@ static int __devinit nuc900_spi_probe(struct platform_device *pdev)
 		goto err_clk;
 	}
 
-	mfp_set_groupg(&pdev->dev);
+	mfp_set_groupg(&pdev->dev, NULL);
 	nuc900_init_spi(hw);
 
 	err = spi_bitbang_start(&hw->bitbang);
diff --git a/trunk/sound/soc/nuc900/nuc900-ac97.c b/trunk/sound/soc/nuc900/nuc900-ac97.c
index 9c0edad90d8b..a4e3237956e2 100644
--- a/trunk/sound/soc/nuc900/nuc900-ac97.c
+++ b/trunk/sound/soc/nuc900/nuc900-ac97.c
@@ -365,7 +365,8 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
 	if (ret)
 		goto out3;
 
-	mfp_set_groupg(nuc900_audio->dev); /* enbale ac97 multifunction pin*/
+	/* enbale ac97 multifunction pin */
+	mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");
 
 	return 0;