From a1c44875a1905c09c82e285ba0293ff6d24cd234 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Mon, 31 Dec 2007 14:58:38 +0100
Subject: [PATCH] --- yaml --- r: 77951 b: refs/heads/master c:
 7998a731664ac4988b349e70669bac11e3b3a3ac h: refs/heads/master i:   77949:
 eae72930faa7f12b084a0e66d649c67e198571e2   77947:
 d5f3f7b61fa2a797f7cee40e09162ec3dd9366c3   77943:
 48387d8fcb9690238ec21440de1293dad1057250   77935:
 628c7cb39216f83632aac32fbf59a91a0ce17813   77919:
 189eeb4efb990afba71e86d0e1339b685093fd22   77887:
 d53ca2ea01eb2b7b0508b15875b569d95c649be8   77823:
 6823498d406e27ca64bccfa471b34b2d50ea1fa5 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/Kbuild | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bf76029ed0ef..d3e99a76a52f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36091fd348e79ab703b0766420c0b06ff7662d2d
+refs/heads/master: 7998a731664ac4988b349e70669bac11e3b3a3ac
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index bd694f779346..ad99ce9f9169 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -34,7 +34,6 @@ header-y += atmsap.h
 header-y += atmsvc.h
 header-y += atm_zatm.h
 header-y += auto_fs4.h
-header-y += auxvec.h
 header-y += ax25.h
 header-y += b1lli.h
 header-y += baycom.h
@@ -73,7 +72,7 @@ header-y += gen_stats.h
 header-y += gigaset_dev.h
 header-y += hdsmart.h
 header-y += hysdn_if.h
-header-y += i2c-dev.h
+header-y += i2o-dev.h
 header-y += i8k.h
 header-y += if_arcnet.h
 header-y += if_bonding.h
@@ -158,7 +157,6 @@ header-y += veth.h
 header-y += video_decoder.h
 header-y += video_encoder.h
 header-y += videotext.h
-header-y += vt.h
 header-y += x25.h
 
 unifdef-y += acct.h
@@ -173,6 +171,7 @@ unifdef-y += atm.h
 unifdef-y += atm_tcp.h
 unifdef-y += audit.h
 unifdef-y += auto_fs.h
+unifdef-y += auxvec.h
 unifdef-y += binfmts.h
 unifdef-y += capability.h
 unifdef-y += capi.h
@@ -214,7 +213,7 @@ unifdef-y += hdreg.h
 unifdef-y += hiddev.h
 unifdef-y += hpet.h
 unifdef-y += i2c.h
-unifdef-y += i2o-dev.h
+unifdef-y += i2c-dev.h
 unifdef-y += icmp.h
 unifdef-y += icmpv6.h
 unifdef-y += if_addr.h
@@ -349,6 +348,7 @@ unifdef-y += videodev.h
 unifdef-y += virtio_config.h
 unifdef-y += virtio_blk.h
 unifdef-y += virtio_net.h
+unifdef-y += vt.h
 unifdef-y += wait.h
 unifdef-y += wanrouter.h
 unifdef-y += watchdog.h