diff --git a/[refs] b/[refs] index d53a7828819b..f425d07928cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 817d10bad56f2fdfa321b4a864a21295226b123a +refs/heads/master: c3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902 diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild index b7d81b2a9041..5dfa739045c8 100644 --- a/trunk/include/linux/Kbuild +++ b/trunk/include/linux/Kbuild @@ -105,7 +105,6 @@ header-y += ixjuser.h header-y += jffs2.h header-y += keyctl.h header-y += limits.h -header-y += dlm_plock.h header-y += magic.h header-y += major.h header-y += matroxfb.h @@ -190,6 +189,7 @@ unifdef-y += cyclades.h unifdef-y += dccp.h unifdef-y += dirent.h unifdef-y += dlm.h +unifdef-y += dlm_plock.h unifdef-y += edd.h unifdef-y += elf.h unifdef-y += elfcore.h