diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 16:47:53 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 16:47:53 -0700 |
| commit | 4e5f67fa538ded704c904157e3ca23ceef9c7e64 (patch) | |
| tree | 660781e409df26cdf2d4bf45954dad5bec2225e5 | |
| parent | 293d0e3bf0818f3f7307a56d3ac31f41b5078aa1 (diff) | |
| parent | ceb2ea195a4167bc1ee9d78b19220562b1524fba (diff) | |
Merge tag 'bcm-for-3.12-late-soc' of git://github.com/broadcom/bcm11351 into next/boards
From Christian Daudt, late changes for 3.12 broadcom mmc driver. Small
trivial changes so I'll take them through arm-soc.
* tag 'bcm-for-3.12-late-soc' of git://github.com/broadcom/bcm11351:
mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
| -rw-r--r-- | drivers/mmc/host/sdhci-bcm-kona.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 9ec7ca5dbcee..85472d3fd37f 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -24,7 +24,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_gpio.h> -#include <linux/version.h> #include <linux/mmc/slot-gpio.h> #include "sdhci-pltfm.h" @@ -162,7 +161,7 @@ static int sdhci_bcm_kona_sd_card_emulate(struct sdhci_host *host, int insert) /* * SD card interrupt event callback */ -void sdhci_bcm_kona_card_event(struct sdhci_host *host) +static void sdhci_bcm_kona_card_event(struct sdhci_host *host) { if (mmc_gpio_get_cd(host->mmc) > 0) { dev_dbg(mmc_dev(host->mmc), |