lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sdhci-of: fix build on non-powerpc platforms

Browse Source 
Explicitly include err.h, of_address.h and of_irq.h.
Make use of machine_is() conditional on PPC.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Rob Herring
2010-11-16 14:33:52 -06:00
committed by Grant Likely
parent 52cfd503ad
commit c289ef4143
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/sdhci-of-core.c
View File

@@ -13,6 +13,7 @@
* your option) any later version. * your option) any later version.
*/ */
#include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
@@ -20,8 +21,12 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#ifdef CONFIG_PPC
#include <asm/machdep.h> #include <asm/machdep.h>
#endif
#include "sdhci-of.h" #include "sdhci-of.h"
#include "sdhci.h" #include "sdhci.h"
@@ -112,7 +117,11 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
return true; return true;
/* Old device trees don't have the wp-inverted property. */ /* Old device trees don't have the wp-inverted property. */
#ifdef CONFIG_PPC
return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds); return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
#else
return false;
#endif
} }
static int __devinit sdhci_of_probe(struct platform_device *ofdev, static int __devinit sdhci_of_probe(struct platform_device *ofdev,