From 72608b15a36879e3f72ecc91d2ffcd12a81962e7 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Mon, 22 Aug 2011 23:28:56 +0200 Subject: [PATCH] --- yaml --- r: 269691 b: refs/heads/master c: ff920bfbe63f240bca6c86ee26daca8a1c43f780 h: refs/heads/master i: 269689: 4f2f16630cdd4051f9bb614a3e5129676e1ce467 269687: 0d1c67960e20c28e07b3c27d97d5f2e125674493 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e7ecc34a2b1..aa58cf841e9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ce51fcfee2355cc38ea6fd3062d94bb38dfbaf0 +refs/heads/master: ff920bfbe63f240bca6c86ee26daca8a1c43f780 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c index bc0b592788bc..82478e0998e5 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c @@ -1129,7 +1129,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) ioremap(pci_resource_start(dev->pdev, ramin_bar), dev_priv->ramin_size); if (!dev_priv->ramin) { - NV_ERROR(dev, "Failed to PRAMIN BAR"); + NV_ERROR(dev, "Failed to map PRAMIN BAR\n"); ret = -ENOMEM; goto err_mmio; }