From cf18f16766ef0ce08e0ceb616a41b03011364b59 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Dec 2011 16:46:59 +0800
Subject: [PATCH] --- yaml --- r: 283909 b: refs/heads/master c:
 bc9c040d363f3be17a59024191e9400e5b6205ae h: refs/heads/master i:   283907:
 60b0868a0dec720498bab6f652ed6326fc668882 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8770.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ac2f40970758..09087a46a73c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf97ca9a0dabd6110a6aa7b4d1b20274973810af
+refs/heads/master: bc9c040d363f3be17a59024191e9400e5b6205ae
diff --git a/trunk/sound/soc/codecs/wm8770.c b/trunk/sound/soc/codecs/wm8770.c
index 8976eb5796d3..ea6f007a8114 100644
--- a/trunk/sound/soc/codecs/wm8770.c
+++ b/trunk/sound/soc/codecs/wm8770.c
@@ -690,7 +690,6 @@ static const struct of_device_id wm8770_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8770_of_match);
 
-#if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8770_spi_probe(struct spi_device *spi)
 {
 	struct wm8770_priv *wm8770;
@@ -726,28 +725,23 @@ static struct spi_driver wm8770_spi_driver = {
 	.probe = wm8770_spi_probe,
 	.remove = __devexit_p(wm8770_spi_remove)
 };
-#endif
 
 static int __init wm8770_modinit(void)
 {
 	int ret = 0;
 
-#if defined(CONFIG_SPI_MASTER)
 	ret = spi_register_driver(&wm8770_spi_driver);
 	if (ret) {
 		printk(KERN_ERR "Failed to register wm8770 SPI driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(wm8770_modinit);
 
 static void __exit wm8770_exit(void)
 {
-#if defined(CONFIG_SPI_MASTER)
 	spi_unregister_driver(&wm8770_spi_driver);
-#endif
 }
 module_exit(wm8770_exit);