Merge branch 'master' of /home/sam/kernel/linux-2.6/

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9ae6b1a75366..685081c01342 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -728,7 +728,9 @@
 #define PCI_DEVICE_ID_TI_TVP4020        0x3d07
 #define PCI_DEVICE_ID_TI_4450           0x8011
 #define PCI_DEVICE_ID_TI_XX21_XX11      0x8031
+#define PCI_DEVICE_ID_TI_XX21_XX11_SD   0x8034
 #define PCI_DEVICE_ID_TI_X515           0x8036
+#define PCI_DEVICE_ID_TI_XX12           0x8039
 #define PCI_DEVICE_ID_TI_1130           0xac12
 #define PCI_DEVICE_ID_TI_1031           0xac13
 #define PCI_DEVICE_ID_TI_1131           0xac15
@@ -1441,6 +1443,7 @@
 #define PCI_DEVICE_ID_RICOH_RL5C475     0x0475
 #define PCI_DEVICE_ID_RICOH_RL5C476     0x0476
 #define PCI_DEVICE_ID_RICOH_RL5C478     0x0478
+#define PCI_DEVICE_ID_RICOH_R5C822      0x0822
 
 #define PCI_VENDOR_ID_DLINK             0x1186
 #define PCI_DEVICE_ID_DLINK_DGE510T     0x4c00