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/uninorth-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/uninorth-agp.c')
| -rw-r--r-- | drivers/char/agp/uninorth-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index f845a8f718b3..a32c492baf5c 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -80,7 +80,7 @@ static void uninorth_tlbflush(struct agp_memory *mem) | |||
| 80 | ctrl | UNI_N_CFG_GART_INVAL); | 80 | ctrl | UNI_N_CFG_GART_INVAL); |
| 81 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl); | 81 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl); |
| 82 | 82 | ||
| 83 | if (uninorth_rev <= 0x30) { | 83 | if (!mem && uninorth_rev <= 0x30) { |
| 84 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, | 84 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, |
| 85 | ctrl | UNI_N_CFG_GART_2xRESET); | 85 | ctrl | UNI_N_CFG_GART_2xRESET); |
| 86 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, | 86 | pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, |