From: Tony Luck <tony.luck@intel.com>
Date: Thu, 8 Sep 2005 21:27:13 +0000 (-0700)
Subject: [IA64] Manual merge fix for 3 files
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=344a076110f4ecb16ea6d286b63be696604982ed;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[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>
---

344a076110f4ecb16ea6d286b63be696604982ed
diff --cc arch/ia64/kernel/acpi.c
index 66970d7b6c87,318787c84ac0..28a4529fdd60
--- a/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 include/asm-ia64/irq.h
index 585644c6b21c,cd984d08fd15..dbe86c0bbce5
--- a/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 */