diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /net/netlabel/Makefile | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'net/netlabel/Makefile')
| -rw-r--r-- | net/netlabel/Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net/netlabel/Makefile b/net/netlabel/Makefile new file mode 100644 index 00000000000..8af18c0a47d --- /dev/null +++ b/net/netlabel/Makefile @@ -0,0 +1,16 @@ +# +# Makefile for the NetLabel subsystem. +# +# Feb 9, 2006, Paul Moore <paul.moore@hp.com> +# + +# base objects +obj-y := netlabel_user.o netlabel_kapi.o netlabel_domainhash.o + +# management objects +obj-y += netlabel_mgmt.o + +# protocol modules +obj-y += netlabel_unlabeled.o +obj-y += netlabel_cipso_v4.o + |