diff options
| author | David S. Miller | 2012-11-25 18:49:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-11-25 18:49:17 +0100 |
| commit | 24bc518a6888e4c97add5a5ebbff11c1ccac219f (patch) | |
| tree | d125270f4e8432cebcbc8af9079dece51dd798a0 /drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | |
| parent | net/macb: GEM DMA configuration register update (diff) | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff) | |
| download | kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.tar.gz kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.tar.xz kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c index 5ccce0b17bf3..f6962c9b6c36 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c @@ -79,6 +79,7 @@ nvc0_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return ret; priv->base.pll_set = nvc0_clock_pll_set; + priv->base.pll_calc = nva3_clock_pll_calc; return 0; } |