diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/linux/screen_info.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/linux/screen_info.h')
| -rw-r--r-- | include/linux/screen_info.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 2925e66a6732..b02308ee7667 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h | |||
| @@ -42,7 +42,8 @@ struct screen_info { | |||
| 42 | u16 pages; /* 0x32 */ | 42 | u16 pages; /* 0x32 */ |
| 43 | u16 vesa_attributes; /* 0x34 */ | 43 | u16 vesa_attributes; /* 0x34 */ |
| 44 | u32 capabilities; /* 0x36 */ | 44 | u32 capabilities; /* 0x36 */ |
| 45 | /* 0x3a -- 0x3f reserved for future expansion */ | 45 | /* 0x3a -- 0x3b reserved for future expansion */ |
| 46 | /* 0x3c -- 0x3f micro stack for relocatable kernels */ | ||
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 48 | extern struct screen_info screen_info; | 49 | extern struct screen_info screen_info; |