Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[~andy/linux] / include / linux / Kbuild

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 839a97ee1f7c92e4a760f39aa29e4f6164fdcdd5..ea005c0a79fdecd0e61d9717aecb19bf86367262 100644 (file)
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -158,12 +158,10 @@ header-y += toshiba.h
 header-y += ultrasound.h
 header-y += un.h
 header-y += utime.h
-header-y += utsname.h
 header-y += video_decoder.h
 header-y += video_encoder.h
 header-y += videotext.h
 header-y += vt.h
-header-y += wavefront.h
 header-y += wireless.h
 header-y += xattr.h
 header-y += x25.h
@@ -223,7 +221,6 @@ unifdef-y += hpet.h
 unifdef-y += i2c.h
 unifdef-y += i2o-dev.h
 unifdef-y += icmpv6.h
-unifdef-y += iflags.h
 unifdef-y += if_bridge.h
 unifdef-y += if_ec.h
 unifdef-y += if_eql.h
@@ -338,6 +335,7 @@ unifdef-y += unistd.h
 unifdef-y += usb_ch9.h
 unifdef-y += usbdevice_fs.h
 unifdef-y += user.h
+unifdef-y += utsname.h
 unifdef-y += videodev2.h
 unifdef-y += videodev.h
 unifdef-y += wait.h