Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[karo-tx-linux.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 6c5ebd38c1b0f050f515dbb2dc1c47acaafc1ba4..ee4353f843eae07a82b7358004d9defb63ae5e96 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -341,10 +341,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                                        gpios[i].gpio, ret);
                }
 
-#ifdef CONFIG_GPIO_SYSFS
                /* Expose GPIO value over sysfs for diagnostic purposes */
                gpio_export(gpios[i].gpio, false);
-#endif
 
                /* Update initial jack status */
                snd_soc_jack_gpio_detect(&gpios[i]);
@@ -376,9 +374,7 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
        int i;
 
        for (i = 0; i < count; i++) {
-#ifdef CONFIG_GPIO_SYSFS
                gpio_unexport(gpios[i].gpio);
-#endif
                free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
                cancel_delayed_work_sync(&gpios[i].work);
                gpio_free(gpios[i].gpio);