projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/platform
[deliverable/linux.git]
/
drivers
/
spi
/
pxa2xx_spi_pci.c
diff --git
a/drivers/spi/pxa2xx_spi_pci.c
b/drivers/spi/pxa2xx_spi_pci.c
index 19752b09e155457a5dc0836b991da2c41802cd52..378e504f89ebdf8dd7b2b503e6c3a79d8820f269 100644
(file)
--- a/
drivers/spi/pxa2xx_spi_pci.c
+++ b/
drivers/spi/pxa2xx_spi_pci.c
@@
-89,9
+89,7
@@
static int __devinit ce4100_spi_probe(struct pci_dev *dev,
goto err_nomem;
pdev->dev.parent = &dev->dev;
goto err_nomem;
pdev->dev.parent = &dev->dev;
-#ifdef CONFIG_OF
pdev->dev.of_node = dev->dev.of_node;
pdev->dev.of_node = dev->dev.of_node;
-#endif
ssp = &spi_info->ssp;
ssp->phys_base = pci_resource_start(dev, 0);
ssp->mmio_base = ioremap(phys_beg, phys_len);
ssp = &spi_info->ssp;
ssp->phys_base = pci_resource_start(dev, 0);
ssp->mmio_base = ioremap(phys_beg, phys_len);
This page took
0.025502 seconds
and
5
git commands to generate.