projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
arch
/
ia64
/
include
/
asm
/
acpi.h
diff --git
a/arch/ia64/include/asm/acpi.h
b/arch/ia64/include/asm/acpi.h
index
faa1bf0
..
d651102
100644
(file)
--- a/
arch/ia64/include/asm/acpi.h
+++ b/
arch/ia64/include/asm/acpi.h
@@
-111,8
+111,6
@@
static inline const char *acpi_get_sysname (void)
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