diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-28 11:45:22 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-28 11:45:22 -0700 |
| commit | 487c42bd42d93304278abce03b36c935bdc83284 (patch) | |
| tree | d1b7330ebe84af6ed8f62ea5a5394d1e7dfd5811 /linux-core/i915_gem_tiling.c | |
| parent | 1bdf35fe19c1aa02b301375b3cae7ad29adacef8 (diff) | |
intel-gem: Another checkpatch.pl pass.
Diffstat (limited to 'linux-core/i915_gem_tiling.c')
| -rw-r--r-- | linux-core/i915_gem_tiling.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/i915_gem_tiling.c b/linux-core/i915_gem_tiling.c index 2841ff1f..90029192 100644 --- a/linux-core/i915_gem_tiling.c +++ b/linux-core/i915_gem_tiling.c @@ -91,10 +91,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN; uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN; int mchbar_offset; - volatile char *mchbar; + char __iomem *mchbar; int ret; - bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0,0)); + bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); if (bridge == NULL) { DRM_ERROR("Couldn't get bridge device\n"); return; @@ -165,7 +165,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) swizzle_x = I915_BIT_6_SWIZZLE_9_10; swizzle_y = I915_BIT_6_SWIZZLE_9; } - } else if (IS_I9XX(dev)){ + } else if (IS_I9XX(dev)) { uint32_t dcc; /* On 915-945 and GM965, channel interleave by the CPU is |