Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5f67fa authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 293d0e3b ceb2ea19

drivers/mmc/host/sdhci-bcm-kona.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/version.h>

#include <linux/mmc/slot-gpio.h>

#include <linux/mmc/slot-gpio.h>





#include "sdhci-pltfm.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

 * 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) {

	if (mmc_gpio_get_cd(host->mmc) > 0) {

		dev_dbg(mmc_dev(host->mmc),

		dev_dbg(mmc_dev(host->mmc),