diff options
| author | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /net/802/Makefile | |
| parent | ftrace: only trace preempt off with preempt tracer (diff) | |
| parent | Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
| download | kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'net/802/Makefile')
| -rw-r--r-- | net/802/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/802/Makefile b/net/802/Makefile index 68569ffddea1..7893d679910c 100644 --- a/net/802/Makefile +++ b/net/802/Makefile @@ -10,3 +10,5 @@ obj-$(CONFIG_FDDI) += fddi.o obj-$(CONFIG_HIPPI) += hippi.o obj-$(CONFIG_IPX) += p8022.o psnap.o p8023.o obj-$(CONFIG_ATALK) += p8022.o psnap.o +obj-$(CONFIG_STP) += stp.o +obj-$(CONFIG_GARP) += garp.o |