diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /include/asm-ppc/pci-bridge.h | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'include/asm-ppc/pci-bridge.h')
| -rw-r--r-- | include/asm-ppc/pci-bridge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h index 9d5230689b31..6c955d0c1ef0 100644 --- a/include/asm-ppc/pci-bridge.h +++ b/include/asm-ppc/pci-bridge.h | |||
| @@ -43,6 +43,7 @@ struct pci_controller { | |||
| 43 | struct pci_controller *next; | 43 | struct pci_controller *next; |
| 44 | struct pci_bus *bus; | 44 | struct pci_bus *bus; |
| 45 | void *arch_data; | 45 | void *arch_data; |
| 46 | struct device *parent; | ||
| 46 | 47 | ||
| 47 | int first_busno; | 48 | int first_busno; |
| 48 | int last_busno; | 49 | int last_busno; |