diff options
author | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
---|---|---|
committer | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
commit | 3886b7e62925a6eb7ca05e3ab23f3d4781439d06 (patch) | |
tree | 529c661c969dbaf23f2dcd75c940a892a3f37d0e /shared-core/nouveau_state.c | |
parent | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (diff) | |
parent | 90ae39d2f07058dd128d2fb19ffad712ee75c9a0 (diff) |
Merge branch 'master' into crestline
Diffstat (limited to 'shared-core/nouveau_state.c')
-rw-r--r-- | shared-core/nouveau_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index f324c5ff..fb35ba74 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -96,8 +96,8 @@ int nouveau_firstopen(struct drm_device *dev) /* FIXME: doesn't belong here, and have no idea what it's for.. */ if (dev_priv->card_type >= NV_40) nv40_graph_init(dev); - else if (dev_priv->card_type >= NV_30) { - } + else if (dev_priv->card_type >= NV_30) + nv30_graph_init(dev); else if (dev_priv->card_type >= NV_20) nv20_graph_init(dev); else if (dev_priv->card_type >= NV_10) |