On Tue, Nov 16, 2010 at 02:33:52PM -0600, Rob Herring wrote: > From: Rob Herring <rob.herring@xxxxxxxxxxx> > > 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@xxxxxxxxxxx> Hmm, sins of the past :/ I wonder if we can get away with less #ifdeffery, will think about it... > --- > 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 fa19d84..dd84124 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, > -- > 1.7.1 > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@xxxxxxxxxxxxxxxx > https://lists.ozlabs.org/listinfo/devicetree-discuss -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
