From: Ben Skeggs Date: Tue, 17 Aug 2010 02:02:43 +0000 (+1000) Subject: drm/nouveau: fix earlier mistake when fixing merge conflict X-Git-Tag: MMI-PSA29.97-13-9~22407^2~4^2~11 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=625db6b7e34580b750a13fd36a211a4366f6c3e2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/nouveau: fix earlier mistake when fixing merge conflict Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e144f7a38d81..e4f33a4edea1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -2166,7 +2166,7 @@ peek_fb(struct drm_device *dev, struct io_mapping *fb, uint32_t val = 0; if (off < pci_resource_len(dev->pdev, 1)) { - uint32_t __iomem *p = + uint8_t __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0); val = ioread32(p + (off & ~PAGE_MASK)); @@ -2182,7 +2182,7 @@ poke_fb(struct drm_device *dev, struct io_mapping *fb, uint32_t off, uint32_t val) { if (off < pci_resource_len(dev->pdev, 1)) { - uint32_t __iomem *p = + uint8_t __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0); iowrite32(val, p + (off & ~PAGE_MASK));