mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h
Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, move it to include/linux/pci_ids.h. [bhelgaas: also update MDPY_PCI_VENDOR_ID] Link: https://lore.kernel.org/r/1594195170-11119-1-git-send-email-chenhc@lemote.com Signed-off-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
		
							parent
							
								
									c7c337c5ed
								
							
						
					
					
						commit
						2575b2f3ee
					
				
					 4 changed files with 3 additions and 4 deletions
				
			
		| 
						 | 
					@ -131,8 +131,6 @@ enum SpiceCursorType {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma pack(push, 1)
 | 
					#pragma pack(push, 1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define REDHAT_PCI_VENDOR_ID 0x1b36
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */
 | 
					/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */
 | 
				
			||||||
#define QXL_DEVICE_ID_STABLE 0x0100
 | 
					#define QXL_DEVICE_ID_STABLE 0x0100
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,6 @@ enum {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define ROCKER_FP_PORTS_MAX 62
 | 
					#define ROCKER_FP_PORTS_MAX 62
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define PCI_VENDOR_ID_REDHAT		0x1b36
 | 
					 | 
				
			||||||
#define PCI_DEVICE_ID_REDHAT_ROCKER	0x0006
 | 
					#define PCI_DEVICE_ID_REDHAT_ROCKER	0x0006
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define ROCKER_PCI_BAR0_SIZE		0x2000
 | 
					#define ROCKER_PCI_BAR0_SIZE		0x2000
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2585,6 +2585,8 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define PCI_VENDOR_ID_ASMEDIA		0x1b21
 | 
					#define PCI_VENDOR_ID_ASMEDIA		0x1b21
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define PCI_VENDOR_ID_REDHAT		0x1b36
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS	0x1c36
 | 
					#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS	0x1c36
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define PCI_VENDOR_ID_CIRCUITCO		0x1cc8
 | 
					#define PCI_VENDOR_ID_CIRCUITCO		0x1cc8
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* pci ids */
 | 
					/* pci ids */
 | 
				
			||||||
#define MDPY_PCI_VENDOR_ID	0x1b36 /* redhat */
 | 
					#define MDPY_PCI_VENDOR_ID	PCI_VENDOR_ID_REDHAT
 | 
				
			||||||
#define MDPY_PCI_DEVICE_ID	0x000f
 | 
					#define MDPY_PCI_DEVICE_ID	0x000f
 | 
				
			||||||
#define MDPY_PCI_SUBVENDOR_ID	PCI_SUBVENDOR_ID_REDHAT_QUMRANET
 | 
					#define MDPY_PCI_SUBVENDOR_ID	PCI_SUBVENDOR_ID_REDHAT_QUMRANET
 | 
				
			||||||
#define MDPY_PCI_SUBDEVICE_ID	PCI_SUBDEVICE_ID_QEMU
 | 
					#define MDPY_PCI_SUBDEVICE_ID	PCI_SUBDEVICE_ID_QEMU
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue