diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/agp/via-agp.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/agp/via-agp.c')
| -rw-r--r-- | drivers/char/agp/via-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c index df67e80019d2..8bc384937401 100644 --- a/drivers/char/agp/via-agp.c +++ b/drivers/char/agp/via-agp.c | |||
| @@ -400,7 +400,7 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = | |||
| 400 | * the traditional AGP which resides only in chipset. AGP is used | 400 | * the traditional AGP which resides only in chipset. AGP is used |
| 401 | * by 3D driver which wasn't available for the VT3336 and VT3364 | 401 | * by 3D driver which wasn't available for the VT3336 and VT3364 |
| 402 | * generation until now. Unfortunately, by testing, VT3364 works | 402 | * generation until now. Unfortunately, by testing, VT3364 works |
| 403 | * but VT3336 doesn't. - explaination from via, just leave this as | 403 | * but VT3336 doesn't. - explanation from via, just leave this as |
| 404 | * as a placeholder to avoid future patches adding it back in. | 404 | * as a placeholder to avoid future patches adding it back in. |
| 405 | */ | 405 | */ |
| 406 | #if 0 | 406 | #if 0 |