diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/i386/boot/video.S | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/boot/video.S')
| -rw-r--r-- | arch/i386/boot/video.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 2ac40c8244c4..0000a2674537 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S | |||
| @@ -1924,6 +1924,7 @@ skip10: movb %ah, %al | |||
| 1924 | ret | 1924 | ret |
| 1925 | 1925 | ||
| 1926 | store_edid: | 1926 | store_edid: |
| 1927 | #ifdef CONFIG_FB_FIRMWARE_EDID | ||
| 1927 | pushw %es # just save all registers | 1928 | pushw %es # just save all registers |
| 1928 | pushw %ax | 1929 | pushw %ax |
| 1929 | pushw %bx | 1930 | pushw %bx |
| @@ -1954,6 +1955,7 @@ store_edid: | |||
| 1954 | popw %bx | 1955 | popw %bx |
| 1955 | popw %ax | 1956 | popw %ax |
| 1956 | popw %es | 1957 | popw %es |
| 1958 | #endif | ||
| 1957 | ret | 1959 | ret |
| 1958 | 1960 | ||
| 1959 | # VIDEO_SELECT-only variables | 1961 | # VIDEO_SELECT-only variables |