diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /include/linux/Kbuild | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 97319a8fc1e0..a354c199ab98 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -367,7 +367,6 @@ header-y += utime.h | |||
| 367 | header-y += utsname.h | 367 | header-y += utsname.h |
| 368 | header-y += veth.h | 368 | header-y += veth.h |
| 369 | header-y += vhost.h | 369 | header-y += vhost.h |
| 370 | header-y += videodev.h | ||
| 371 | header-y += videodev2.h | 370 | header-y += videodev2.h |
| 372 | header-y += virtio_9p.h | 371 | header-y += virtio_9p.h |
| 373 | header-y += virtio_balloon.h | 372 | header-y += virtio_balloon.h |