git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-i386
/
mach-es7000
/
mach_mpparse.h
diff --git
a/include/asm-i386/mach-es7000/mach_mpparse.h
b/include/asm-i386/mach-es7000/mach_mpparse.h
index
3bcad6a
..
0aae264
100644
(file)
--- a/
include/asm-i386/mach-es7000/mach_mpparse.h
+++ b/
include/asm-i386/mach-es7000/mach_mpparse.h
@@
-12,26
+12,28
@@
static inline void mpc_oem_pci_bus(struct mpc_config_bus *m,
{
}
{
}
-extern
void
parse_unisys_oem (char *oemptr, int oem_entries);
+extern
int
parse_unisys_oem (char *oemptr, int oem_entries);
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length);
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length);
-static inline
void mps_oem_check(struct mp_config_table *mpc, char *oem,
+static inline
int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table =
(struct mp_config_oemtable *)mpc->mpc_oemptr;
char *productid)
{
if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table =
(struct mp_config_oemtable *)mpc->mpc_oemptr;
- parse_unisys_oem((char *)oem_table, oem_table->oem_length);
+
return
parse_unisys_oem((char *)oem_table, oem_table->oem_length);
}
}
+ return 0;
}
/* Hook from generic ACPI tables.c */
}
/* Hook from generic ACPI tables.c */
-static inline
void
acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static inline
int
acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
unsigned long oem_addr;
int oem_entries;
if (!find_unisys_acpi_oem_table(&oem_addr, &oem_entries))
{
unsigned long oem_addr;
int oem_entries;
if (!find_unisys_acpi_oem_table(&oem_addr, &oem_entries))
- parse_unisys_oem((char *)oem_addr, oem_entries);
+ return parse_unisys_oem((char *)oem_addr, oem_entries);
+ return 0;
}
}