From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Mar 2010 18:14:46 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d03ab7ff335b7fbf48d0fd28ead5d7957798510b;p=linux-beck.git

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wrong attribute of HUB chip written in uv_setup()
  [IA64] remove trailing space in messages
  [IA64] use asm-generic/scatterlist.h
  [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
  [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
  [IA64] Remove COMPAT_IA32 support
---

d03ab7ff335b7fbf48d0fd28ead5d7957798510b
diff --cc arch/ia64/include/asm/acpi.h
index 93997bd5edc3,d3b48305a08f..21adbd7f90f8
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@@ -98,9 -98,33 +98,34 @@@ ia64_acpi_release_global_lock (unsigne
  #endif
  #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
  static inline void disable_acpi(void) { }
 +static inline void pci_acpi_crs_quirks(void) { }
  
+ #ifdef CONFIG_IA64_GENERIC
  const char *acpi_get_sysname (void);
+ #else
+ static inline const char *acpi_get_sysname (void)
+ {
+ # if defined (CONFIG_IA64_HP_SIM)
+ 	return "hpsim";
+ # elif defined (CONFIG_IA64_HP_ZX1)
+ 	return "hpzx1";
+ # elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB)
+ 	return "hpzx1_swiotlb";
+ # elif defined (CONFIG_IA64_SGI_SN2)
+ 	return "sn2";
+ # elif defined (CONFIG_IA64_SGI_UV)
+ 	return "uv";
+ # elif defined (CONFIG_IA64_DIG)
+ 	return "dig";
+ # elif defined (CONFIG_IA64_XEN_GUEST)
+ 	return "xen";
+ # elif defined(CONFIG_IA64_DIG_VTD)
+ 	return "dig_vtd";
+ # else
+ #	error Unknown platform.  Fix acpi.c.
+ # endif
+ }
+ #endif
  int acpi_request_vector (u32 int_type);
  int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);