Commit f3812c2a authored by Linus Torvalds's avatar Linus Torvalds

Merge http://mdomsch.bkbits.net/linux-2.5-edd

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 91bb1cf1 cd92c5f3
This diff is collapsed.
...@@ -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.
......
...@@ -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