diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 16:41:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 16:41:30 -0400 |
| commit | eba4f669d6ec9be4173bb2619e9b8500b3c36542 (patch) | |
| tree | 60178d4f2dd4fa1f8985b38fdbe4cd6b99a58c7a /drivers/char/agp/agp.h | |
| parent | 93cffffa19960464a52f9c78d9a6150270d23785 (diff) | |
| parent | 66bb8bf8b235ba4d37fda14375827864977c6a3e (diff) | |
Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'drivers/char/agp/agp.h')
| -rw-r--r-- | drivers/char/agp/agp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index ad9c11391d81..c1fe013c64f3 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h | |||
| @@ -278,6 +278,8 @@ void agp3_generic_cleanup(void); | |||
| 278 | #define AGP_GENERIC_SIZES_ENTRIES 11 | 278 | #define AGP_GENERIC_SIZES_ENTRIES 11 |
| 279 | extern struct aper_size_info_16 agp3_generic_sizes[]; | 279 | extern struct aper_size_info_16 agp3_generic_sizes[]; |
| 280 | 280 | ||
| 281 | #define virt_to_gart(x) (phys_to_gart(virt_to_phys(x))) | ||
| 282 | #define gart_to_virt(x) (phys_to_virt(gart_to_phys(x))) | ||
| 281 | 283 | ||
| 282 | extern int agp_off; | 284 | extern int agp_off; |
| 283 | extern int agp_try_unsupported_boot; | 285 | extern int agp_try_unsupported_boot; |