diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /security/selinux/Makefile | |
| parent | V4L/DVB (3415): Msp3400-kthreads.c: make 3 functions static (diff) | |
| parent | Linux 2.6.16 (diff) | |
| download | linux-b05005772f34497eb2b7415a651fe785cbe70e16.tar.xz linux-b05005772f34497eb2b7415a651fe785cbe70e16.zip | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'security/selinux/Makefile')
| -rw-r--r-- | security/selinux/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/selinux/Makefile b/security/selinux/Makefile index 06d54d9d20a5..688c0a267b62 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -4,9 +4,7 @@ obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/ -selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o - -selinux-$(CONFIG_SECURITY_NETWORK) += netif.o +selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o |