diff options
| author |   Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /include/linux/vgaarb.h | |
| parent | arch/tile: check kmalloc() result (diff) | |
| parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| download | linux-dev-ab11b487402f97975f3ac1eeea09c82f4431481e.tar.xz linux-dev-ab11b487402f97975f3ac1eeea09c82f4431481e.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/vgaarb.h')
| -rw-r--r-- | include/linux/vgaarb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index c9a975976995..814f294d4cd0 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -29,6 +29,7 @@ */ #ifndef LINUX_VGA_H +#define LINUX_VGA_H #include <asm/vga.h> |