diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:51:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:51:09 -0400 |
| commit | 723e9db7a46e328527cc3da2b478b831184fe828 (patch) | |
| tree | cdeda255633057dcb4c84097bed27b2bbf76970f /include/linux/pci_ids.h | |
| parent | ada3fa15057205b7d3f727bba5cd26b5912e350f (diff) | |
| parent | d331d8305cba713605854aab63a000fb892353a7 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
powerpc/nvram: Enable use Generic NVRAM driver for different size chips
powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
powerpc/ps3: Workaround for flash memory I/O error
powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
powerpc/perf_counters: Reduce stack usage of power_check_constraints
powerpc: Fix bug where perf_counters breaks oprofile
powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
powerpc/irq: Improve nanodoc
powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
powerpc/book3e: Add missing page sizes
powerpc/pseries: Fix to handle slb resize across migration
powerpc/powermac: Thermal control turns system off too eagerly
powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
powerpc/405ex: support cuImage via included dtb
powerpc/405ex: provide necessary fixup function to support cuImage
powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
powerpc/44x: Update Arches defconfig
powerpc/44x: Update Arches dts
...
Fix up conflicts in drivers/char/agp/uninorth-agp.c
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 555a8262fbc2..0d96be93b926 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -881,6 +881,7 @@ | |||
| 881 | #define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051 | 881 | #define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051 |
| 882 | #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 | 882 | #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 |
| 883 | #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 | 883 | #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 |
| 884 | #define PCI_DEVICE_ID_APPLE_U4_PCIE 0x005b | ||
| 884 | #define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066 | 885 | #define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066 |
| 885 | #define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069 | 886 | #define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069 |
| 886 | #define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a | 887 | #define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a |