diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
| commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
| tree | 726e49653f7014bea034c59624ea23c21d6df13f /drivers/gpu/drm/nouveau/nouveau_drm.h | |
| parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h index 819471217546..a10169927086 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h | |||
| @@ -141,4 +141,6 @@ int nouveau_drm_resume(struct pci_dev *); | |||
| 141 | nv_info((cli), fmt, ##args); \ | 141 | nv_info((cli), fmt, ##args); \ |
| 142 | } while (0) | 142 | } while (0) |
| 143 | 143 | ||
| 144 | extern int nouveau_modeset; | ||
| 145 | |||
| 144 | #endif | 146 | #endif |