[IA64] Manual merge fix for 3 files

	arch/ia64/Kconfig
	arch/ia64/kernel/acpi.c
	include/asm-ia64/irq.h

Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/configs/sn2_defconfig
Simple merge

diff --cc arch/ia64/configs/tiger_defconfig
Simple merge

diff --cc arch/ia64/configs/zx1_defconfig
Simple merge

diff --cc arch/ia64/defconfig
Simple merge

diff --cc arch/ia64/kernel/acpi.c
index 66970d7b6c87a34360aebb47cef427ef2be8ad01,318787c84ac0eda2ec0ae05a7dd2115c5d080f12..28a4529fdd60aed47c0cc2824ad381f763a73c2e
--- 1/arch/ia64/kernel/acpi.c
--- 2/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@@ -570,20 -573,26 +573,24 @@@ int acpi_register_gsi(u32 gsi, int edge
                return isa_irq_to_vector(gsi);
  
        return iosapic_register_intr(gsi,
-                       (active_high_low == ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                       (edge_level == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
+                                    (active_high_low ==
+                                     ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH :
+                                    IOSAPIC_POL_LOW,
+                                    (edge_level ==
+                                     ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE :
+                                    IOSAPIC_LEVEL);
  }
+ 
  EXPORT_SYMBOL(acpi_register_gsi);
  
- void
- acpi_unregister_gsi (u32 gsi)
 -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
+ void acpi_unregister_gsi(u32 gsi)
  {
        iosapic_unregister_intr(gsi);
  }
+ 
  EXPORT_SYMBOL(acpi_unregister_gsi);
 -#endif                                /* CONFIG_ACPI_DEALLOCATE_IRQ */
  
- static int __init
- acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
+ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)
  {
        struct acpi_table_header *fadt_header;
        struct fadt_descriptor_rev2 *fadt;

diff --cc arch/ia64/kernel/iosapic.c
Simple merge

diff --cc arch/ia64/mm/fault.c
Simple merge

diff --cc include/asm-ia64/irq.h
index 585644c6b21cf79352d681db353eae007822ed0f,cd984d08fd15b09f27cdc28c4698b38d7bd57ddc..dbe86c0bbce5f896f25e4934228ac2c36228227a
--- 1/include/asm-ia64/irq.h
--- 2/include/asm-ia64/irq.h
+++ b/include/asm-ia64/irq.h
@@@ -30,10 -35,8 +35,4 @@@ extern void disable_irq_nosync (unsigne
  extern void enable_irq (unsigned int);
  extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
  
- #ifdef CONFIG_SMP
- extern void move_irq(int irq);
- #else
- #define move_irq(irq)
- #endif
 -struct irqaction;
 -struct pt_regs;
 -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
--
  #endif /* _ASM_IA64_IRQ_H */