diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-22 10:56:19 +1000 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-23 15:49:47 +1000 |
| commit | ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70 (patch) | |
| tree | a9534bac7060e546c0c3e6ea34d0469d8903bf0e /include/video | |
| parent | 9525ca0286afd54a5cd69d9ded741b4df8d0c554 (diff) | |
| download | linux-3.10-ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70.tar.gz linux-3.10-ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70.tar.bz2 linux-3.10-ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70.zip | |
Make asm-x86/bootparam.h includable from userspace.
To actually write a bootloader (or, say, the lguest launcher)
currently requires duplication of these structures. Making them
includable from userspace is much nicer.
We merge the common userspace-required definitions of e820_32/64.h
into e820.h for export.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/Kbuild | 1 | ||||
| -rw-r--r-- | include/video/edid.h | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/video/Kbuild b/include/video/Kbuild index 53a6c7310e6..0e406f730c2 100644 --- a/include/video/Kbuild +++ b/include/video/Kbuild @@ -1 +1,2 @@ unifdef-y += sisfb.h uvesafb.h +unifdef-y += edid.h diff --git a/include/video/edid.h b/include/video/edid.h index f6a42d6c2e2..928c342b33d 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,17 +1,16 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -#ifdef __KERNEL__ - +#if !defined(__KERNEL__) || defined(CONFIG_X86) -#ifdef CONFIG_X86 struct edid_info { unsigned char dummy[128]; }; +#ifdef __KERNEL__ extern struct edid_info edid_info; -#endif /* CONFIG_X86 */ - #endif /* __KERNEL__ */ +#endif + #endif /* __linux_video_edid_h__ */ |