From d1cedacbfa9634a0a825b9e40ae2db415e6e4b66 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 29 Mar 2013 17:22:24 -0300
Subject: [PATCH] --- yaml --- r: 366933 b: refs/heads/master c:
 6bf7861fa2bb4be3cc70a6e9aed664ce65270027 h: refs/heads/master i:   366931:
 f1a08fe500d35d8d8712dff6c1f4da6cddc991a8 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/media/radio/Kconfig | 2 +-
 trunk/drivers/mfd/Kconfig         | 1 +
 trunk/drivers/mfd/si476x-i2c.c    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c19d11ae6ad8..5b0334ed7534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0efc3ed0530b08e9e1cba5f63e9c251ca3d7428
+refs/heads/master: 6bf7861fa2bb4be3cc70a6e9aed664ce65270027
diff --git a/trunk/drivers/media/radio/Kconfig b/trunk/drivers/media/radio/Kconfig
index 28ded247abc0..fef427e386c1 100644
--- a/trunk/drivers/media/radio/Kconfig
+++ b/trunk/drivers/media/radio/Kconfig
@@ -20,7 +20,7 @@ source "drivers/media/radio/si470x/Kconfig"
 
 config RADIO_SI476X
 	tristate "Silicon Laboratories Si476x I2C FM Radio"
-	depends on I2C && VIDEO_V4L2
+	depends on I2C && VIDEO_V4L2 && SND && SND_SOC
 	select MFD_CORE
 	select MFD_SI476X_CORE
 	select SND_SOC_SI476X
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index 9b80e1edeeb6..2f97ad188fc2 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -980,6 +980,7 @@ config MFD_SI476X_CORE
 	tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio."
 	depends on I2C
 	select MFD_CORE
+	select REGMAP_I2C
 	help
 	  This is the core driver for the SI476x series of AM/FM
 	  radio. This MFD driver connects the radio-si476x V4L2 module
diff --git a/trunk/drivers/mfd/si476x-i2c.c b/trunk/drivers/mfd/si476x-i2c.c
index 118c6b13d8cb..f5bc8e4bd4bf 100644
--- a/trunk/drivers/mfd/si476x-i2c.c
+++ b/trunk/drivers/mfd/si476x-i2c.c
@@ -389,7 +389,7 @@ static void si476x_core_drain_rds_fifo(struct work_struct *work)
 			kfifo_in(&core->rds_fifo, report.rds,
 				 sizeof(report.rds));
 			dev_dbg(&core->client->dev, "RDS data:\n %*ph\n",
-				sizeof(report.rds), report.rds);
+				(int)sizeof(report.rds), report.rds);
 		}
 		dev_dbg(&core->client->dev, "Drrrrained!\n");
 		wake_up_interruptible(&core->rds_read_queue);