diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2003-05-20 04:29:04 +0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2003-05-20 04:29:04 +0100 |
| commit | 80981cbbd1c8de6eba1ebf78880b62f38ff248e6 (patch) | |
| tree | fe0556fd8fe9e5192f83d93a97f78dae62b5c77b /include | |
| parent | 2864cffb53ce36f05a3a5b91f11c8d81a6c37267 (diff) | |
| parent | 62ffabd9b6b10b95bf2db08302991b5f6ccca697 (diff) | |
Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/agp.h | 13 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-ppc/agp.h b/include/asm-ppc/agp.h new file mode 100644 index 000000000000..a2c4e4ba66f9 --- /dev/null +++ b/include/asm-ppc/agp.h @@ -0,0 +1,13 @@ +#ifndef AGP_H +#define AGP_H 1 + +#include <asm/io.h> + +/* nothing much needed here */ + +#define map_page_into_agp(page) +#define unmap_page_from_agp(page) +#define flush_agp_mappings() +#define flush_agp_cache() mb() + +#endif diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f300bfb4f37f..4c8f4240d33d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1131,6 +1131,7 @@ #define PCI_DEVICE_ID_VIA_8754 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 #define PCI_DEVICE_ID_VIA_P4N333 0x3178 +#define PCI_DEVICE_ID_VIA_K8T400M_0 0x3188 #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_KM400 0x3205 #define PCI_DEVICE_ID_VIA_P4M400 0x3209 |