diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 52f7ca80c0..416a5c276c 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -44,9 +44,6 @@
 #define CONFIG_VGA 1
 #define CONFIG_VIDEO 1
 
-#define CONFIG_HOTPLUG 1
-#define CONFIG_HOTPLUG_CPU 1
-
 #define CONFIG_XENOPROF 1
 #define CONFIG_WATCHDOG 1
 
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 17fe5505d3..7072013dc3 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -117,14 +117,6 @@ extern struct kernel_param __setup_start, __setup_end;
 
 #endif /* __ASSEMBLY__ */
 
-#ifdef CONFIG_HOTPLUG
-#define __devexit
-#define __devexitdata
-#else
-#define __devexit __exit
-#define __devexitdata __exitdata
-#endif
-
 #ifdef CONFIG_LATE_HWDOM
 #define __hwdom_init
 #define __hwdom_initdata  __read_mostly