diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-02 14:23:38 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 14:23:38 +0300 |
commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
tree | db7c8d00931180c4896c9e00d2cb506939592cda /include/linux/vgaarb.h | |
parent | 8a6f7e14fc3b3ea911838c3f4ce137cb8a3d134a (diff) | |
parent | f535daed925c2d3c1db06b06a63c4955f2c51988 (diff) | |
download | talos-op-linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.tar.gz talos-op-linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.zip |
Merge branch 'devel-misc' into omap-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> |