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

Commit a652883a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  of/powerpc: fix fsl_msi device node pointer
  of/watchdog: gef_wdt.c: fix build breakage
  of/edac: fix build breakage in drivers
  of/net: fs_enet/mii-bitbang.c: fix build breakage
  of/usb: fsl_qe_udc.c: fix build breakage
  of/crypto: crypto4xx_core.c: fix build breakage
  of/dma: fix build breakage in ppc4xx adma driver
  of/mtd: nand: fix build breakage in drivers
  of/video: fix build breakage in FB drivers
  of/pcmcia: m8xx_pcmcia.c: Fix build failures
  of/rtc: rtc-mpc5121.c: Fix build failures
  of/dma: mpc512x_dma.c: Fix build failures
  of/mtd/nand: mpc5121_nfc.c: Fix build failures
  of/spi: mpc512x_psc_spi.c: Fix build failures
  watchdog: Fix build failure with OF changes
  of/spi: Fix build failure on spi_ppc4xx.c
  of/usb: fix build error due to of_node pointer move
  of/powerpc: fix 85xx RapidIO device node pointer
parents a57ee627 ee227c57

arch/powerpc/sysdev/fsl_msi.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, 
		goto error_out;

	}

	offset = 0;

	p = of_get_property(dev->node, "msi-available-ranges", &len);

	p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);

	if (p)

		offset = *p / IRQS_PER_MSI_REG;

arch/powerpc/sysdev/fsl_rio.c

+1 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ int fsl_rio_setup(struct of_device *dev) 
	port->iores.flags = IORESOURCE_MEM;

	port->iores.name = "rio_io_win";



	priv->pwirq   = irq_of_parse_and_map(dev->node, 0);

	priv->pwirq   = irq_of_parse_and_map(dev->dev.of_node, 0);

	priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);

	priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);

	priv->rxirq = irq_of_parse_and_map(dev->dev.of_node, 4);

drivers/crypto/amcc/crypto4xx_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev, 
	struct device *dev = &ofdev->dev;

	struct crypto4xx_core_device *core_dev;



	rc = of_address_to_resource(ofdev->node, 0, &res);

	rc = of_address_to_resource(ofdev->dev.of_node, 0, &res);

	if (rc)

		return -ENODEV;
@@ -1215,13 +1215,13 @@ static int __init crypto4xx_probe(struct of_device *ofdev, 
		     (unsigned long) dev);



	/* Register for Crypto isr, Crypto Engine IRQ */

	core_dev->irq = irq_of_parse_and_map(ofdev->node, 0);

	core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);

	rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0,

			 core_dev->dev->name, dev);

	if (rc)

		goto err_request_irq;



	core_dev->dev->ce_base = of_iomap(ofdev->node, 0);

	core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0);

	if (!core_dev->dev->ce_base) {

		dev_err(dev, "failed to of_iomap\n");

		goto err_iomap;

drivers/dma/mpc512x_dma.c

+5 −5
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, 
static int __devinit mpc_dma_probe(struct of_device *op,

					const struct of_device_id *match)

{

	struct device_node *dn = op->node;

	struct device_node *dn = op->dev.of_node;

	struct device *dev = &op->dev;

	struct dma_device *dma;

	struct mpc_dma *mdma;
@@ -771,12 +771,12 @@ static struct of_device_id mpc_dma_match[] = { 
};



static struct of_platform_driver mpc_dma_driver = {

	.match_table	= mpc_dma_match,

	.probe		= mpc_dma_probe,

	.remove		= __devexit_p(mpc_dma_remove),

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

		.of_match_table	= mpc_dma_match,

	},

};

drivers/dma/ppc4xx/adma.c

+2 −2
Original line number Diff line number Diff line
@@ -4394,7 +4394,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, 
static int __devinit ppc440spe_adma_probe(struct of_device *ofdev,

					  const struct of_device_id *match)

{

	struct device_node *np = ofdev->node;

	struct device_node *np = ofdev->dev.of_node;

	struct resource res;

	struct ppc440spe_adma_device *adev;

	struct ppc440spe_adma_chan *chan;
@@ -4626,7 +4626,7 @@ static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, 
static int __devexit ppc440spe_adma_remove(struct of_device *ofdev)

{

	struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);

	struct device_node *np = ofdev->node;

	struct device_node *np = ofdev->dev.of_node;

	struct resource res;

	struct dma_chan *chan, *_chan;

	struct ppc_dma_chan_ref *ref, *_ref;