Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(Revision 2238)
+++ scripts/Kconfig.frag	(Arbeitskopie)
@@ -12,12 +12,12 @@ comment "(menu Device Drivers/Input devi
 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 
 comment "NOTE: Xenomai currently conflicts with HPET support."
-       depends on HPET_TIMER
+	depends on HPET_TIMER && !X86_64
 comment "(menu Processor type and features)"
-       depends on HPET_TIMER
+	depends on HPET_TIMER && !X86_64
 
 config XENOMAI
-       depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && !HPET_TIMER
+	depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || X86_64)
 	bool "Xenomai"
 	default y
         select IPIPE