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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
i386
/
mach-es7000
/
es7000plat.c
diff --git
a/arch/i386/mach-es7000/es7000plat.c
b/arch/i386/mach-es7000/es7000plat.c
index
a9ab064
..
3d0fc85
100644
(file)
--- a/
arch/i386/mach-es7000/es7000plat.c
+++ b/
arch/i386/mach-es7000/es7000plat.c
@@
-51,8
+51,6
@@
struct mip_reg *host_reg;
int mip_port;
unsigned long mip_addr, host_addr;
int mip_port;
unsigned long mip_addr, host_addr;
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
-
/*
* GSI override for ES7000 platforms.
*/
/*
* GSI override for ES7000 platforms.
*/
@@
-76,8
+74,6
@@
es7000_rename_gsi(int ioapic, int gsi)
return gsi;
}
return gsi;
}
-#endif /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
-
void __init
setup_unisys(void)
{
void __init
setup_unisys(void)
{
@@
-160,6
+156,7
@@
parse_unisys_oem (char *oemptr)
return es7000_plat;
}
return es7000_plat;
}
+#ifdef CONFIG_ACPI
int __init
find_unisys_acpi_oem_table(unsigned long *oem_addr)
{
int __init
find_unisys_acpi_oem_table(unsigned long *oem_addr)
{
@@
-212,6
+209,7
@@
find_unisys_acpi_oem_table(unsigned long *oem_addr)
}
return -1;
}
}
return -1;
}
+#endif
static void
es7000_spin(int n)
static void
es7000_spin(int n)