diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/uapi/linux/tc_act/Kbuild | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/uapi/linux/tc_act/Kbuild')
| -rw-r--r-- | include/uapi/linux/tc_act/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 0623ec4e728f..56f121605c99 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | # UAPI Header export list | 1 | # UAPI Header export list |
| 2 | header-y += tc_csum.h | 2 | header-y += tc_csum.h |
| 3 | header-y += tc_defact.h | ||
| 3 | header-y += tc_gact.h | 4 | header-y += tc_gact.h |
| 4 | header-y += tc_ipt.h | 5 | header-y += tc_ipt.h |
| 5 | header-y += tc_mirred.h | 6 | header-y += tc_mirred.h |