From 3e9c4fe9793ebbb0c1e3a9364299513fb299d5a3 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Wed, 3 Feb 2010 18:24:35 +0100
Subject: [PATCH] --- yaml --- r: 180590 b: refs/heads/master c:
 391ae22ae5726d2a8cebfa62879635c54a349642 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/ssb/main.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f257e48ca630..ea730efaabdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6c3f5be7c6ac3375f44de4545c1ffe216b34022
+refs/heads/master: 391ae22ae5726d2a8cebfa62879635c54a349642
diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c
index 5681ebed9c65..03dfd27c4bfb 100644
--- a/trunk/drivers/ssb/main.c
+++ b/trunk/drivers/ssb/main.c
@@ -494,8 +494,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
 #endif
 			break;
 		case SSB_BUSTYPE_SDIO:
-#ifdef CONFIG_SSB_SDIO
-			sdev->irq = bus->host_sdio->dev.irq;
+#ifdef CONFIG_SSB_SDIOHOST
 			dev->parent = &bus->host_sdio->dev;
 #endif
 			break;