Skip to content

L
linux
Commit 1298f185 authored by Matt Domsch's avatar Matt Domsch
Browse files
Options

Merge dell.com:/home/mdomsch/bk/linux-2.5 

into dell.com:/home/mdomsch/bk/edd/linux-2.5-edd
parents c98a2447 7b468323
Expand all Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 133 deletions
arch/i386/kernel/edd.c
View file @ 1298f185
This diff is collapsed.
arch/i386/kernel/setup.c
View file @ 1298f185
...@@ -474,7 +474,7 @@ static int __init copy_e820_map(struct e820entry * biosmap, int nr_map) ...@@ -474,7 +474,7 @@ static int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
unsigned char eddnr; unsigned char eddnr;
struct edd_info edd[EDDNR]; struct edd_info edd[EDDMAXNR];
/** /**
* copy_edd() - Copy the BIOS EDD information * copy_edd() - Copy the BIOS EDD information
* from empty_zero_page into a safe place. * from empty_zero_page into a safe place.
......
include/asm-i386/edd.h
View file @ 1298f185
...@@ -165,7 +165,7 @@ struct edd_info { ...@@ -165,7 +165,7 @@ struct edd_info {
struct edd_device_params params; struct edd_device_params params;
} __attribute__ ((packed)); } __attribute__ ((packed));
extern struct edd_info edd[EDDNR]; extern struct edd_info edd[EDDMAXNR];
extern unsigned char eddnr; extern unsigned char eddnr;
#endif /*!__ASSEMBLY__ */ #endif /*!__ASSEMBLY__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7