diff options
author | Steven Smith <ssmith@xensource.com> | 2006-10-31 11:44:47 +0000 |
---|---|---|
committer | Steven Smith <ssmith@xensource.com> | 2006-10-31 11:44:47 +0000 |
commit | 69ff2305bba8c9348991bf417e15e18be3d52ca3 (patch) | |
tree | 7aa8c6d1b9e25ea776655ae815ad0a7b6b14574b /unmodified_drivers/linux-2.6 | |
parent | 80cc85d4374d4cebc6aad26a717b6674eb5f34ac (diff) | |
parent | 98f201b0e52492cf8e29ec7c0521b76fd5fb0128 (diff) | |
download | xen-69ff2305bba8c9348991bf417e15e18be3d52ca3.tar.gz xen-69ff2305bba8c9348991bf417e15e18be3d52ca3.tar.bz2 xen-69ff2305bba8c9348991bf417e15e18be3d52ca3.zip |
Merge.
Diffstat (limited to 'unmodified_drivers/linux-2.6')
-rw-r--r-- | unmodified_drivers/linux-2.6/Makefile | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | unmodified_drivers/linux-2.6/mkbuildtree | 1 | ||||
-rw-r--r-- | unmodified_drivers/linux-2.6/util/Kbuild | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/Makefile b/unmodified_drivers/linux-2.6/Makefile index 95d558f77b..119016f531 100644 --- a/unmodified_drivers/linux-2.6/Makefile +++ b/unmodified_drivers/linux-2.6/Makefile @@ -4,3 +4,4 @@ obj-m += platform-pci/ obj-m += xenbus/ obj-m += blkfront/ obj-m += netfront/ +obj-m += util/ diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index ce0a142447..5b6b8643ee 100644..100755 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -22,6 +22,7 @@ done ln -sf ${XL}/drivers/xen/core/gnttab.c platform-pci ln -sf ${XL}/drivers/xen/core/features.c platform-pci ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus +ln -sf ${XL}/drivers/xen/core/reboot.c util mkdir -p include mkdir -p include/xen diff --git a/unmodified_drivers/linux-2.6/util/Kbuild b/unmodified_drivers/linux-2.6/util/Kbuild new file mode 100644 index 0000000000..35495d8194 --- /dev/null +++ b/unmodified_drivers/linux-2.6/util/Kbuild @@ -0,0 +1,3 @@ +include $(M)/overrides.mk + +obj-m := reboot.o |