diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /include/linux/pci_ids.h | |
parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
download | linux-e152f18027552eb34006b35347e72bc805783027.tar.xz |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
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 0f8447376ddb..0eb65796bcb9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1568,6 +1568,7 @@ #define PCI_DEVICE_ID_RICOH_RL5C476 0x0476 #define PCI_DEVICE_ID_RICOH_RL5C478 0x0478 #define PCI_DEVICE_ID_RICOH_R5C822 0x0822 +#define PCI_DEVICE_ID_RICOH_R5CE822 0xe822 #define PCI_DEVICE_ID_RICOH_R5CE823 0xe823 #define PCI_DEVICE_ID_RICOH_R5C832 0x0832 #define PCI_DEVICE_ID_RICOH_R5C843 0x0843 |