[PATCH] Remove all ifdefs for local/io apic

[linux-2.6] / include / asm-x86_64 / mpspec.h

diff --git a/include/asm-x86_64/mpspec.h b/include/asm-x86_64/mpspec.h
index 6f8a17d105abaeb7ac90f222b84bea64e64983d4..3c7aae9fd157b6acc4d0c5cfc79389ed29b97125 100644 (file)
--- a/include/asm-x86_64/mpspec.h
+++ b/include/asm-x86_64/mpspec.h
@@ -76,7 +76,7 @@ struct mpc_config_bus
 {
        unsigned char mpc_type;
        unsigned char mpc_busid;
-       unsigned char mpc_bustype[6] __attribute((packed));
+       unsigned char mpc_bustype[6];
 };
 
 /* List of Bus Type string values, Intel MP Spec. */
@@ -184,12 +184,10 @@ extern int pic_mode;
 extern void mp_register_lapic (u8 id, u8 enabled);
 extern void mp_register_lapic_address (u64 address);
 
-#ifdef CONFIG_X86_IO_APIC
 extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
 extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi);
 extern void mp_config_acpi_legacy_irqs (void);
-extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
-#endif /*CONFIG_X86_IO_APIC*/
+extern int mp_register_gsi (u32 gsi, int triggering, int polarity);
 #endif
 
 extern int using_apic_timer;