diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 09:03:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 09:03:07 -0700 |
| commit | 0d6810091cdbd05efeb31654c6a41a6cbdfdd2c8 (patch) | |
| tree | 44d79f8133ea6acd791fe4f32188789c2c65da93 /include/video/edid.h | |
| parent | a98ce5c6feead6bfedefabd46cb3d7f5be148d9a (diff) | |
| parent | 43d33b21a03d3abcc8cbdeb4d52bc4568f822c5e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: (45 commits)
Use "struct boot_params" in example launcher
Loading bzImage directly.
Revert lguest magic and use hook in head.S
Update lguest documentation to reflect the new virtual block device name.
generalize lgread_u32/lgwrite_u32.
Example launcher handle guests not being ready for input
Update example launcher for virtio
Lguest support for Virtio
Remove old lguest I/O infrrasructure.
Remove old lguest bus and drivers.
Virtio helper routines for a descriptor ringbuffer implementation
Module autoprobing support for virtio drivers.
Virtio console driver
Block driver using virtio.
Net driver using virtio
Virtio interface
Boot with virtual == physical to get closer to native Linux.
Allow guest to specify syscall vector to use.
Rename "cr3" to "gpgdir" to avoid x86-specific naming.
Pagetables to use normal kernel types
...
Diffstat (limited to 'include/video/edid.h')
| -rw-r--r-- | include/video/edid.h | 9 |
1 files changed, 4 insertions, 5 deletions
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__ */ |