diff --git a/[refs] b/[refs] index 7ebf1ec2084b..01ea439d604f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 998f6fabbf439e6d518dcbaf9191cb533447b57a +refs/heads/master: e035cc35e54230eb704ee7feccf476ed2fb2ae29 diff --git a/trunk/include/asm-generic/Kbuild.asm b/trunk/include/asm-generic/Kbuild.asm index da163c123edb..bdb8b089d85d 100644 --- a/trunk/include/asm-generic/Kbuild.asm +++ b/trunk/include/asm-generic/Kbuild.asm @@ -5,7 +5,7 @@ unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \ statfs.h termbits.h termios.h timex.h types.h unistd.h user.h # These really shouldn't be exported -unifdef-y += atomic.h io.h +unifdef-y += io.h # These probably shouldn't be exported unifdef-y += elf.h page.h