diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 09:24:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 09:24:45 +0200 |
| commit | 07706c9b79b88baff5f160351b482ccdf3315f0c (patch) | |
| tree | 0679ad42a802894aae3d535efdaf229d985b54bc /shared-core/nouveau_mem.c | |
| parent | 3d4b32e91647f61712d54a46f0a173deff46e6b4 (diff) | |
| parent | a70fe82baf0ca2be98e02680cff489f90b0ea3de (diff) | |
Merge branch 'master' into drm-ttm-finalize
Diffstat (limited to 'shared-core/nouveau_mem.c')
| -rw-r--r-- | shared-core/nouveau_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c index e2f0b38d..448b69d3 100644 --- a/shared-core/nouveau_mem.c +++ b/shared-core/nouveau_mem.c @@ -223,7 +223,7 @@ void nouveau_mem_close(struct drm_device *dev) static uint32_t nouveau_mem_fb_amount_igp(struct drm_device *dev) { -#if defined(LINUX) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) +#if defined(__linux__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) struct drm_nouveau_private *dev_priv = dev->dev_private; struct pci_dev *bridge; uint32_t mem; |