---

yaml --- r: 118133 b: refs/heads/master c: 87c6f40 h: refs/heads/master i: 118131: 7c156b2 v: v3
git-mirror · Oct 28, 2008 · 4ec2391 · 4ec2391
1 parent d15edf2
commit 4ec2391
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11a6b0c933b55654a58afd84f63a5dde1607d78f
+refs/heads/master: 87c6f40128f92621698f97a62d2ead5184d1dd97
diff --git a/trunk/arch/x86/kernel/k8.c b/trunk/arch/x86/kernel/k8.c
@@ -18,7 +18,6 @@ static u32 *flush_words;
 struct pci_device_id k8_nb_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
 	{}
 };
 EXPORT_SYMBOL(k8_nb_ids);

diff --git a/trunk/arch/x86/kernel/pci-gart_64.c b/trunk/arch/x86/kernel/pci-gart_64.c
@@ -744,7 +744,7 @@ void __init gart_iommu_init(void)
 	long i;
 
 	if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {
-		printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");
+		printk(KERN_INFO "PCI-GART: No AMD GART found.\n");
 		return;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -744,7 +744,7 @@ void __init gart_iommu_init(void) @@
     	long i;
     	if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {
-    		printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");
+    		printk(KERN_INFO "PCI-GART: No AMD GART found.\n");
     		return;
     	}
@@ Expand Down @@