summaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 05:42:30 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 05:42:30 +0200
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /arch/um/sys-i386/Makefile
parentAutomatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 (diff)
parentMerge /spare/repo/linux-2.6/ (diff)
downloadlinux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.tar.xz
linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.zip
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'arch/um/sys-i386/Makefile')
-rw-r--r--arch/um/sys-i386/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 4351e5605506..095bcdb0b9cc 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -17,3 +17,5 @@ highmem.c-dir = mm
module.c-dir = kernel
subdir- := util
+
+include arch/um/scripts/Makefile.unmap