diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:55:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:55:47 -0400 |
| commit | e86908614f2c7fec401827e5cefd7a6ea9407f85 (patch) | |
| tree | fcb5d9e52422b37bdaf0e647126ebdfc1680f162 /include/linux/pci_ids.h | |
| parent | 547307420931344a868275bd7ea7a30f117a15a9 (diff) | |
| parent | 9b4b8feb962f4b3e74768b7205f1f8f6cce87238 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
[POWERPC] Add memchr() to the bootwrapper
[POWERPC] Implement logging of unhandled signals
[POWERPC] Add legacy serial support for OPB with flattened device tree
[POWERPC] Use 1TB segments
[POWERPC] XilinxFB: Allow fixed framebuffer base address
[POWERPC] XilinxFB: Add support for custom screen resolution
[POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
[POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
[POWERPC] 4xx: Kilauea defconfig file
[POWERPC] 4xx: Kilauea DTS
[POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
[POWERPC] 4xx: Add AMCC 405EX support to cputable.c
[POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
[POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
[POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
[POWERPC] 85xx: Killed <asm/mpc85xx.h>
[POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
[POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
[POWERPC] mpc8272ads: Remove muram from the CPM reg property.
[POWERPC] Make clockevents work on PPC601 processors
...
Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 8acae4eeaa76..3948708c42ca 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2113,8 +2113,11 @@ | |||
| 2113 | #define PCI_DEVICE_ID_MPC8533 0x0031 | 2113 | #define PCI_DEVICE_ID_MPC8533 0x0031 |
| 2114 | #define PCI_DEVICE_ID_MPC8544E 0x0032 | 2114 | #define PCI_DEVICE_ID_MPC8544E 0x0032 |
| 2115 | #define PCI_DEVICE_ID_MPC8544 0x0033 | 2115 | #define PCI_DEVICE_ID_MPC8544 0x0033 |
| 2116 | #define PCI_DEVICE_ID_MPC8572E 0x0040 | ||
| 2117 | #define PCI_DEVICE_ID_MPC8572 0x0041 | ||
| 2116 | #define PCI_DEVICE_ID_MPC8641 0x7010 | 2118 | #define PCI_DEVICE_ID_MPC8641 0x7010 |
| 2117 | #define PCI_DEVICE_ID_MPC8641D 0x7011 | 2119 | #define PCI_DEVICE_ID_MPC8641D 0x7011 |
| 2120 | #define PCI_DEVICE_ID_MPC8610 0x7018 | ||
| 2118 | 2121 | ||
| 2119 | #define PCI_VENDOR_ID_PASEMI 0x1959 | 2122 | #define PCI_VENDOR_ID_PASEMI 0x1959 |
| 2120 | 2123 | ||