git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
pci-common.c
diff --git
a/arch/powerpc/kernel/pci-common.c
b/arch/powerpc/kernel/pci-common.c
index
9021c4a
..
10a44e6
100644
(file)
--- a/
arch/powerpc/kernel/pci-common.c
+++ b/
arch/powerpc/kernel/pci-common.c
@@
-1090,8
+1090,6
@@
void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
bus->number, bus->self ? pci_name(bus->self) : "PHB");
list_for_each_entry(dev, &bus->devices, bus_list) {
bus->number, bus->self ? pci_name(bus->self) : "PHB");
list_for_each_entry(dev, &bus->devices, bus_list) {
- struct dev_archdata *sd = &dev->dev.archdata;
-
/* Cardbus can call us to add new devices to a bus, so ignore
* those who are already fully discovered
*/
/* Cardbus can call us to add new devices to a bus, so ignore
* those who are already fully discovered
*/
@@
-1107,7
+1105,7
@@
void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
set_dev_node(&dev->dev, pcibus_to_node(dev->bus));
/* Hook up default DMA ops */
set_dev_node(&dev->dev, pcibus_to_node(dev->bus));
/* Hook up default DMA ops */
- s
d->dma_ops = pci_dma_ops
;
+ s
et_dma_ops(&dev->dev, pci_dma_ops)
;
set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
/* Additional platform DMA/iommu setup */
set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
/* Additional platform DMA/iommu setup */