diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-23 15:34:12 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-23 15:34:12 +0100 |
| commit | d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 (patch) | |
| tree | c6f723b2c02e7a6e7cbcd4e7fe8f64b6c5b9e002 /shared-core/nouveau_mem.c | |
| parent | 198170ab97bbf2ca6362bb7100e9ed86d90aa51f (diff) | |
| parent | a294aa724a1e932fb6017383e08532bfcc914df0 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
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; |