diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:32:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:32:36 -0500 |
| commit | 905adce4094d64a6691df994e424fbf486301adc (patch) | |
| tree | c4e3a2fb1465eeb713b3bec5ef4634c28179a14b /include/linux/pci_ids.h | |
| parent | 78149df6d565c36675463352d0bfe0000b02b7a7 (diff) | |
| parent | 1e8f34f7d88c969a06229a786241839d49dd63e3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
ide-acpi support warning fix
ACPI support for IDE devices
IDE Driver for Delkin/Lexar/etc.. cardbus CF adapter
ide: it8213 IDE driver update (version 2)
ide: add it8213 IDE driver
tc86c001: add missing __init tag for tc86c001_ide_init()
tc86c001: mark init_chipset_tc86c001() with __devinit tag
tc86c001: init_hwif_tc86c001() can be static
ide: add Toshiba TC86C001 IDE driver (take 2)
pdc202xx_new: remove check_in_drive_lists abomination
pdc202xx_new: remove useless code
slc90e66: carry over fixes from piix driver
piix: tuneproc() fixes/cleanups
piix: fix 82371MX enablebits
hpt366: HPT36x PCI clock detection fix
hpt366: init code rewrite
hpt366: clean up DMA timeout handling for HPT370
hpt366: merge HPT37x speedproc handlers
hpt366: cache channel's MCR address
hpt366: switch to using pci_get_slot
...
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 5b4f1e3caf5d..defdeed20641 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1454,6 +1454,7 @@ | |||
| 1454 | 1454 | ||
| 1455 | #define PCI_VENDOR_ID_TOSHIBA_2 0x102f | 1455 | #define PCI_VENDOR_ID_TOSHIBA_2 0x102f |
| 1456 | #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 | 1456 | #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 |
| 1457 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE 0x0105 | ||
| 1457 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 | 1458 | #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 |
| 1458 | #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 | 1459 | #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 |
| 1459 | 1460 | ||