[AMD][Family 1Ah] Merge PCI identifier lists

cyring · Nov 17, 2024 · 7ee38f9 · 7ee38f9
1 parent c75af85
commit 7ee38f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 
 COREFREQ_MAJOR = 1
 COREFREQ_MINOR = 98
-COREFREQ_REV = 6
+COREFREQ_REV = 7
 HW = $(shell uname -m)
 CC ?= cc
 WARNING = -Wall -Wfatal-errors

diff --git a/x86_64/corefreqk.h b/x86_64/corefreqk.h
@@ -3442,13 +3442,7 @@ static struct pci_device_id PCI_AMD_17h_ids[] = {
 		PCI_VDEVICE(AMD, DID_AMD_19H_PHOENIX_DF_UMC),
 		.driver_data = (kernel_ulong_t) AMD_DataFabric_Phoenix
 	},
-	{0, }
-};
-
-#define PCI_AMD_19h_ids PCI_AMD_17h_ids
-
 /* AMD Family 1Ah							*/
-static struct pci_device_id PCI_AMD_1Ah_ids[] = {
 	{
 		PCI_VDEVICE(AMD, DID_AMD_1AH_ZEN5_TURIN_IOMMU),
 		.driver_data = (kernel_ulong_t) AMD_Zen_IOMMU
@@ -3460,6 +3454,9 @@ static struct pci_device_id PCI_AMD_1Ah_ids[] = {
 	{0, }
 };
 
+#define PCI_AMD_19h_ids PCI_AMD_17h_ids
+#define PCI_AMD_1Ah_ids PCI_AMD_17h_ids
+
 	 /*	Left as empty for initialization purpose.	*/
 static char *Arch_Misc_Processor[]	=	ZLIST(NULL);