diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-x86_64/k8.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-x86_64/k8.h')
| -rw-r--r-- | include/asm-x86_64/k8.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-x86_64/k8.h b/include/asm-x86_64/k8.h new file mode 100644 index 000000000000..699dd6961eda --- /dev/null +++ b/include/asm-x86_64/k8.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #ifndef _ASM_K8_H | ||
| 2 | #define _ASM_K8_H 1 | ||
| 3 | |||
| 4 | #include <linux/pci.h> | ||
| 5 | |||
| 6 | extern struct pci_device_id k8_nb_ids[]; | ||
| 7 | |||
| 8 | extern int early_is_k8_nb(u32 value); | ||
| 9 | extern struct pci_dev **k8_northbridges; | ||
| 10 | extern int num_k8_northbridges; | ||
| 11 | extern int cache_k8_northbridges(void); | ||
| 12 | extern void k8_flush_garts(void); | ||
| 13 | |||
| 14 | #endif | ||