diff options
-rw-r--r-- | drivers/mmc/host/sdhci.c | 12 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4d010a984bed..3b1b54f9b0fe 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
@@ -149,7 +149,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host) | |||
149 | writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL); | 149 | writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL); |
150 | } | 150 | } |
151 | 151 | ||
152 | #ifdef CONFIG_LEDS_CLASS | 152 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
153 | static void sdhci_led_control(struct led_classdev *led, | 153 | static void sdhci_led_control(struct led_classdev *led, |
154 | enum led_brightness brightness) | 154 | enum led_brightness brightness) |
155 | { | 155 | { |
@@ -994,7 +994,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) | |||
994 | 994 | ||
995 | WARN_ON(host->mrq != NULL); | 995 | WARN_ON(host->mrq != NULL); |
996 | 996 | ||
997 | #ifndef CONFIG_LEDS_CLASS | 997 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
998 | sdhci_activate_led(host); | 998 | sdhci_activate_led(host); |
999 | #endif | 999 | #endif |
1000 | 1000 | ||
@@ -1201,7 +1201,7 @@ static void sdhci_tasklet_finish(unsigned long param) | |||
1201 | host->cmd = NULL; | 1201 | host->cmd = NULL; |
1202 | host->data = NULL; | 1202 | host->data = NULL; |
1203 | 1203 | ||
1204 | #ifndef CONFIG_LEDS_CLASS | 1204 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
1205 | sdhci_deactivate_led(host); | 1205 | sdhci_deactivate_led(host); |
1206 | #endif | 1206 | #endif |
1207 | 1207 | ||
@@ -1717,7 +1717,7 @@ int sdhci_add_host(struct sdhci_host *host) | |||
1717 | sdhci_dumpregs(host); | 1717 | sdhci_dumpregs(host); |
1718 | #endif | 1718 | #endif |
1719 | 1719 | ||
1720 | #ifdef CONFIG_LEDS_CLASS | 1720 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
1721 | host->led.name = mmc_hostname(mmc); | 1721 | host->led.name = mmc_hostname(mmc); |
1722 | host->led.brightness = LED_OFF; | 1722 | host->led.brightness = LED_OFF; |
1723 | host->led.default_trigger = mmc_hostname(mmc); | 1723 | host->led.default_trigger = mmc_hostname(mmc); |
@@ -1739,7 +1739,7 @@ int sdhci_add_host(struct sdhci_host *host) | |||
1739 | 1739 | ||
1740 | return 0; | 1740 | return 0; |
1741 | 1741 | ||
1742 | #ifdef CONFIG_LEDS_CLASS | 1742 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
1743 | reset: | 1743 | reset: |
1744 | sdhci_reset(host, SDHCI_RESET_ALL); | 1744 | sdhci_reset(host, SDHCI_RESET_ALL); |
1745 | free_irq(host->irq, host); | 1745 | free_irq(host->irq, host); |
@@ -1775,7 +1775,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) | |||
1775 | 1775 | ||
1776 | mmc_remove_host(host->mmc); | 1776 | mmc_remove_host(host->mmc); |
1777 | 1777 | ||
1778 | #ifdef CONFIG_LEDS_CLASS | 1778 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
1779 | led_classdev_unregister(&host->led); | 1779 | led_classdev_unregister(&host->led); |
1780 | #endif | 1780 | #endif |
1781 | 1781 | ||
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 31f4b1528e76..3efba2363941 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h | |||
@@ -220,7 +220,7 @@ struct sdhci_host { | |||
220 | struct mmc_host *mmc; /* MMC structure */ | 220 | struct mmc_host *mmc; /* MMC structure */ |
221 | u64 dma_mask; /* custom DMA mask */ | 221 | u64 dma_mask; /* custom DMA mask */ |
222 | 222 | ||
223 | #ifdef CONFIG_LEDS_CLASS | 223 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
224 | struct led_classdev led; /* LED control */ | 224 | struct led_classdev led; /* LED control */ |
225 | #endif | 225 | #endif |
226 | 226 | ||