git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ia64
/
hp
/
sim
/
Makefile
diff --git
a/arch/ia64/hp/sim/Makefile
b/arch/ia64/hp/sim/Makefile
index
d10da47
..
b0916cd
100644
(file)
--- a/
arch/ia64/hp/sim/Makefile
+++ b/
arch/ia64/hp/sim/Makefile
@@
-14,3
+14,5
@@
obj-$(CONFIG_HP_SIMETH) += simeth.o
obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o
obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
+obj-$(CONFIG_XEN) += simserial.o
+obj-$(CONFIG_XEN) += hpsim_console.o