diff options
author | Alex Williamson <alex.williamson@hp.com> | 2007-08-16 10:47:33 -0600 |
---|---|---|
committer | Alex Williamson <alex.williamson@hp.com> | 2007-08-16 10:47:33 -0600 |
commit | f628da7abf0393892246e568ae2090541cd72a4c (patch) | |
tree | 88999035fe4cfc22dcadb3742cbca11fc82b266c /unmodified_drivers | |
parent | a787af4ec3fd8874011ae0e9750fdb481a92319a (diff) | |
parent | e28e04d59312ec8cef673ffdca34231648c03431 (diff) | |
download | xen-f628da7abf0393892246e568ae2090541cd72a4c.tar.gz xen-f628da7abf0393892246e568ae2090541cd72a4c.tar.bz2 xen-f628da7abf0393892246e568ae2090541cd72a4c.zip |
merge with xen-unstable.hg
Diffstat (limited to 'unmodified_drivers')
-rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c index bd58d2ceb5..33c468d594 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c +++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c @@ -1,5 +1,6 @@ #include <linux/config.h> -#include <linux/stop_machine.h> +#include <linux/cpumask.h> +#include <linux/preempt.h> #include <xen/evtchn.h> #include <xen/gnttab.h> #include <xen/xenbus.h> |