From 99d66285190bc57e13f5742affc505b9d63e25b5 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 20 Jan 2012 22:18:06 +0000
Subject: [PATCH] --- yaml --- r: 296379 b: refs/heads/master c:
 69dde86aa616b09bb3ef39a5ab783f82254d241c h: refs/heads/master i:   296377:
 795e4dd5adb42fb3c88de89a47dffc5d64fa531b   296375:
 741a54c71f5ad82bd8c1c654205f9db8c4de671f v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-sa1100/assabet.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bcde51185e2e..53ea398febb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33237616771bfc29a97f17e74efe3799bb790343
+refs/heads/master: 69dde86aa616b09bb3ef39a5ab783f82254d241c
diff --git a/trunk/arch/arm/mach-sa1100/assabet.c b/trunk/arch/arm/mach-sa1100/assabet.c
index 3a1914568374..c45402f866cc 100644
--- a/trunk/arch/arm/mach-sa1100/assabet.c
+++ b/trunk/arch/arm/mach-sa1100/assabet.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
+#include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
@@ -199,9 +200,14 @@ static struct irda_platform_data assabet_irda_data = {
 	.set_speed	= assabet_irda_set_speed,
 };
 
+static struct ucb1x00_plat_data assabet_ucb1x00_data = {
+	.gpio_base	= -1,
+};
+
 static struct mcp_plat_data assabet_mcp_data = {
 	.mccr0		= MCCR0_ADM,
 	.sclk_rate	= 11981000,
+	.codec_pdata	= &assabet_ucb1x00_data,
 };
 
 static void __init assabet_init(void)