diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
| commit | c54f9da1c8ceee19436430afac0798a989eb886d (patch) | |
| tree | 412f51c3f2641e4205b767cec95ce6107cd39d36 /drivers/video/matrox/matroxfb_base.h | |
| parent | a2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/irqstats
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.h')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index f3107ad7e545..95883236c0cd 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h | |||
| @@ -200,7 +200,7 @@ static inline int mga_ioremap(unsigned long phys, unsigned long size, int flags, | |||
| 200 | virt->vaddr = ioremap_nocache(phys, size); | 200 | virt->vaddr = ioremap_nocache(phys, size); |
| 201 | else | 201 | else |
| 202 | virt->vaddr = ioremap(phys, size); | 202 | virt->vaddr = ioremap(phys, size); |
| 203 | return (virt->vaddr == 0); /* 0, !0... 0, error_code in future */ | 203 | return (virt->vaddr == NULL); /* 0, !0... 0, error_code in future */ |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | static inline void mga_iounmap(vaddr_t va) { | 206 | static inline void mga_iounmap(vaddr_t va) { |