diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /include/linux/Kbuild | |
parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r-- | include/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 2124c063a7ef..b97cdc516a8f 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -90,7 +90,6 @@ header-y += if_ppp.h | |||
90 | header-y += if_slip.h | 90 | header-y += if_slip.h |
91 | header-y += if_strip.h | 91 | header-y += if_strip.h |
92 | header-y += if_tun.h | 92 | header-y += if_tun.h |
93 | header-y += if_tunnel.h | ||
94 | header-y += in_route.h | 93 | header-y += in_route.h |
95 | header-y += ioctl.h | 94 | header-y += ioctl.h |
96 | header-y += ip6_tunnel.h | 95 | header-y += ip6_tunnel.h |
@@ -236,6 +235,7 @@ unifdef-y += if_phonet.h | |||
236 | unifdef-y += if_pppol2tp.h | 235 | unifdef-y += if_pppol2tp.h |
237 | unifdef-y += if_pppox.h | 236 | unifdef-y += if_pppox.h |
238 | unifdef-y += if_tr.h | 237 | unifdef-y += if_tr.h |
238 | unifdef-y += if_tunnel.h | ||
239 | unifdef-y += if_vlan.h | 239 | unifdef-y += if_vlan.h |
240 | unifdef-y += igmp.h | 240 | unifdef-y += igmp.h |
241 | unifdef-y += inet_diag.h | 241 | unifdef-y += inet_diag.h |