aboutsummaryrefslogtreecommitdiff
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-02-09 09:34:45 -0600
committerFelix Blyakher <felixb@sgi.com>2009-02-09 09:34:45 -0600
commitd41d4113f49e16bfab02eff0248282200be21807 (patch)
treeae84803c22a09f138023ef62de73712f324bc62d /include/linux/Kbuild
parentb58a4cc51f4f569c6a86979890f9b237a504ab6b (diff)
parentd5b562330ec766292a3ac54ae5e0673610bd5b3d (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 2124c063a7e..b97cdc516a8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -90,7 +90,6 @@ header-y += if_ppp.h
header-y += if_slip.h
header-y += if_strip.h
header-y += if_tun.h
-header-y += if_tunnel.h
header-y += in_route.h
header-y += ioctl.h
header-y += ip6_tunnel.h
@@ -236,6 +235,7 @@ unifdef-y += if_phonet.h
unifdef-y += if_pppol2tp.h
unifdef-y += if_pppox.h
unifdef-y += if_tr.h
+unifdef-y += if_tunnel.h
unifdef-y += if_vlan.h
unifdef-y += igmp.h
unifdef-y += inet_diag.h