lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'merge' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2009-05-29 13:54:52 +10:00
parent d7b41b1fdf b5c42bc8db
commit 435462c6e6
269 changed files with 11366 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/pci_ids.h
View File

@@ -1406,7 +1406,7 @@
#define PCI_DEVICE_ID_VIA_82C598_1 0x8598
#define PCI_DEVICE_ID_VIA_838X_1 0xB188
#define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198
#define PCI_DEVICE_ID_VIA_C409_IDE 0XC409
#define PCI_DEVICE_ID_VIA_VX855_IDE 0xC409
#define PCI_DEVICE_ID_VIA_ANON 0xFFFF
#define PCI_VENDOR_ID_SIEMENS 0x110A