diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/char/agp | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/agpgart_be.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c index 447716420..274c9a86b 100644 --- a/drivers/char/agp/agpgart_be.c +++ b/drivers/char/agp/agpgart_be.c @@ -81,7 +81,7 @@ static inline void flush_cache(void) #endif } -#ifdef __SMP__ +#ifdef CONFIG_SMP static atomic_t cpus_waiting; static void ipi_handler(void *null) @@ -102,9 +102,9 @@ static void smp_flush_cache(void) barrier(); } #define global_cache_flush smp_flush_cache -#else /* __SMP__ */ +#else /* CONFIG_SMP */ #define global_cache_flush flush_cache -#endif /* __SMP__ */ +#endif /* CONFIG_SMP */ int agp_backend_acquire(void) { @@ -1768,6 +1768,30 @@ static struct { PCI_VENDOR_ID_SI, SIS_GENERIC, "SiS", + "630", + sis_generic_setup }, + { PCI_DEVICE_ID_SI_540, + PCI_VENDOR_ID_SI, + SIS_GENERIC, + "SiS", + "540", + sis_generic_setup }, + { PCI_DEVICE_ID_SI_620, + PCI_VENDOR_ID_SI, + SIS_GENERIC, + "SiS", + "620", + sis_generic_setup }, + { PCI_DEVICE_ID_SI_530, + PCI_VENDOR_ID_SI, + SIS_GENERIC, + "SiS", + "530", + sis_generic_setup }, + { PCI_DEVICE_ID_SI_630, + PCI_VENDOR_ID_SI, + SIS_GENERIC, + "SiS", "Generic", sis_generic_setup }, { PCI_DEVICE_ID_SI_540, |