diff options
| author | Rob Herring | 2010-11-16 21:33:52 +0100 |
|---|---|---|
| committer | Grant Likely | 2011-01-14 08:22:44 +0100 |
| commit | c289ef41431144a538b5fb5f94fc83c81b3020e2 (patch) | |
| tree | e0d0ffe6f72119f51b34c6802072c670ad90e215 /drivers/mmc/host/sdhci-of-core.c | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| download | kernel-qcow2-linux-c289ef41431144a538b5fb5f94fc83c81b3020e2.tar.gz kernel-qcow2-linux-c289ef41431144a538b5fb5f94fc83c81b3020e2.tar.xz kernel-qcow2-linux-c289ef41431144a538b5fb5f94fc83c81b3020e2.zip | |
mmc: sdhci-of: fix build on non-powerpc platforms
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>
Diffstat (limited to 'drivers/mmc/host/sdhci-of-core.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-of-core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c index fa19d849a920..dd84124f4209 100644 --- a/drivers/mmc/host/sdhci-of-core.c +++ b/drivers/mmc/host/sdhci-of-core.c @@ -13,6 +13,7 @@ * your option) any later version. */ +#include <linux/err.h> #include <linux/module.h> #include <linux/init.h> #include <linux/io.h> @@ -20,8 +21,12 @@ #include <linux/delay.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> #include <linux/mmc/host.h> +#ifdef CONFIG_PPC #include <asm/machdep.h> +#endif #include "sdhci-of.h" #include "sdhci.h" @@ -112,7 +117,11 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np) return true; /* Old device trees don't have the wp-inverted property. */ +#ifdef CONFIG_PPC return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds); +#else + return false; +#endif } static int __devinit sdhci_of_probe(struct platform_device *ofdev, |