diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 19:38:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 19:38:02 +0200 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-ppc64/prom.h | |
| parent | [PATCH] Fix misspelled i8259 typo in io_apic.c (diff) | |
| parent | Allow PCI config space syscalls to be used by 64-bit processes. (diff) | |
| download | linux-3aed77bc84013fced136977b7cc17fff60eddf7a.tar.xz linux-3aed77bc84013fced136977b7cc17fff60eddf7a.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-ppc64/prom.h')
| -rw-r--r-- | include/asm-ppc64/prom.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h index dc5330b39509..c02ec1d6b909 100644 --- a/include/asm-ppc64/prom.h +++ b/include/asm-ppc64/prom.h @@ -116,14 +116,6 @@ struct property { struct property *next; }; -/* NOTE: the device_node contains PCI specific info for pci devices. - * This perhaps could be hung off the device_node with another struct, - * but for now it is directly in the node. The phb ptr is a good - * indication of a real PCI node. Other nodes leave these fields zeroed. - */ -struct pci_controller; -struct iommu_table; - struct device_node { char *name; char *type; @@ -135,16 +127,6 @@ struct device_node { struct interrupt_info *intrs; char *full_name; - /* PCI stuff probably doesn't belong here */ - int busno; /* for pci devices */ - int bussubno; /* for pci devices */ - int devfn; /* for pci devices */ - int eeh_mode; /* See eeh.h for possible EEH_MODEs */ - int eeh_config_addr; - int pci_ext_config_space; /* for pci devices */ - struct pci_controller *phb; /* for pci devices */ - struct iommu_table *iommu_table; /* for phb's or bridges */ - struct property *properties; struct device_node *parent; struct device_node *child; @@ -154,6 +136,7 @@ struct device_node { struct proc_dir_entry *pde; /* this node's proc directory */ struct kref kref; unsigned long _flags; + void *data; }; extern struct device_node *of_chosen; |