Skip to main content

Browse the archive

Revision 238d1d0f79f619d75c2cc741d6770fb0986aef24 authored by Linus Torvalds on 30 December 2016, 17:32:26 UTC, committed by Linus Torvalds on 30 December 2016, 17:32:26 UTC 
Merge tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux
 
Pull documentation fixes from Jonathan Corbet:
 "Two small fixes:

   - A merge error on my part broke the DocBook build. I've
     requisitioned one of tglx's frozen sharks for appropriate
     disciplinary action and resolved to be more careful about testing
     the DocBook stuff as long as it's still around.

   - Fix an error in unaligned-memory-access.txt"

* tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux:
  Documentation/unaligned-memory-access.txt: fix incorrect comparison operator
  docs: Fix build failure
2 parent s f3de082 + 36f671b
Raw File
Makefile 
#
# Makefile for MPLS.
#
obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o
obj-$(CONFIG_MPLS_ROUTING) += mpls_router.o
obj-$(CONFIG_MPLS_IPTUNNEL) += mpls_iptunnel.o

mpls_router-y := af_mpls.o
back to top