Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: mmc_spi: Fix unterminated of_match_table of/sparc: fix build regression from of_device changes of/device: Replace struct of_device with struct platform_device
This commit is contained in:
@ -1536,6 +1536,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
|
||||
#if defined(CONFIG_OF)
|
||||
static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
|
||||
{ .compatible = "mmc-spi-slot", },
|
||||
{},
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -85,14 +85,14 @@ void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg)
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int sdhci_of_suspend(struct of_device *ofdev, pm_message_t state)
|
||||
static int sdhci_of_suspend(struct platform_device *ofdev, pm_message_t state)
|
||||
{
|
||||
struct sdhci_host *host = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
return mmc_suspend_host(host->mmc);
|
||||
}
|
||||
|
||||
static int sdhci_of_resume(struct of_device *ofdev)
|
||||
static int sdhci_of_resume(struct platform_device *ofdev)
|
||||
{
|
||||
struct sdhci_host *host = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
@ -115,7 +115,7 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
|
||||
return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
|
||||
}
|
||||
|
||||
static int __devinit sdhci_of_probe(struct of_device *ofdev,
|
||||
static int __devinit sdhci_of_probe(struct platform_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
@ -183,7 +183,7 @@ err_addr_map:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit sdhci_of_remove(struct of_device *ofdev)
|
||||
static int __devexit sdhci_of_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct sdhci_host *host = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
|
Reference in New Issue
Block a user