diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /arch/i386/kernel/setup.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/i386/kernel/setup.c')
| -rw-r--r-- | arch/i386/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index b48ac635f3c1..fdfcb0cba9b4 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
| @@ -129,9 +129,7 @@ struct drive_info_struct { char dummy[32]; } drive_info; | |||
| 129 | EXPORT_SYMBOL(drive_info); | 129 | EXPORT_SYMBOL(drive_info); |
| 130 | #endif | 130 | #endif |
| 131 | struct screen_info screen_info; | 131 | struct screen_info screen_info; |
| 132 | #ifdef CONFIG_VT | ||
| 133 | EXPORT_SYMBOL(screen_info); | 132 | EXPORT_SYMBOL(screen_info); |
| 134 | #endif | ||
| 135 | struct apm_info apm_info; | 133 | struct apm_info apm_info; |
| 136 | EXPORT_SYMBOL(apm_info); | 134 | EXPORT_SYMBOL(apm_info); |
| 137 | struct sys_desc_table_struct { | 135 | struct sys_desc_table_struct { |